mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-21 03:25:12 +08:00
update
This commit is contained in:
@@ -2,8 +2,12 @@ package com.jsowell.pile.mapper;
|
||||
|
||||
import com.jsowell.pile.domain.OrderDetail;
|
||||
import java.util.List;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import com.jsowell.pile.vo.lianlian.OrderTempVO;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface OrderDetailMapper {
|
||||
/**
|
||||
* delete by primary key
|
||||
@@ -56,4 +60,6 @@ public interface OrderDetailMapper {
|
||||
int updateBatchSelective(List<OrderDetail> list);
|
||||
|
||||
int batchInsert(@Param("list") List<OrderDetail> list);
|
||||
|
||||
List<OrderTempVO> selectByStationId(String stationId);
|
||||
}
|
||||
@@ -3372,6 +3372,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
||||
String type = ThirdPartyOperatorIdEnum.getTypeByOperatorId(operatorId);
|
||||
// 生成订单
|
||||
String orderCode = dto.getStartChargeSeq();
|
||||
//2025.5.23发现生成的订单为425010765000000000273551033向对方平台推送订单信息接口,对方平台反差错误,使用MA1JLFUU8成功
|
||||
//但是在启动充电接口中只能使用425010765运营商id,才能启动成功,使用MA1JLFUU8错误
|
||||
if(orderCode.substring(0,9).equals(ThirdPartyOperatorIdEnum.LIAN_LIAN_PLATFORM.getOperatorId())){
|
||||
orderCode = "MA1JLFUU8" + orderCode.substring(9);
|
||||
}
|
||||
String pileConnectorCode = dto.getConnectorID();
|
||||
// String pileSn = StringUtils.substring(pileConnectorCode, 0, 14);
|
||||
String pileSn = YKCUtils.getPileSn(pileConnectorCode);
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
package com.jsowell.pile.vo.lianlian;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class OrderTempVO {
|
||||
|
||||
private String orderCode;
|
||||
|
||||
private String transactionCode;
|
||||
|
||||
private BigDecimal totalUsedElectricity;
|
||||
|
||||
private String createTime;
|
||||
|
||||
private String settlementTime;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
package com.jsowell.pile.vo.lianlian;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 站点用电统计VO
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class StationElectStatsInfos {
|
||||
|
||||
/**
|
||||
* 站点ID
|
||||
*/
|
||||
private String stationId;
|
||||
|
||||
/**
|
||||
* 统计开始时间(格式:yyyy-MM-dd HH:mm:ss)
|
||||
*/
|
||||
private String startTime;
|
||||
|
||||
/**
|
||||
* 统计结束时间(格式:yyyy-MM-dd HH:mm:ss)
|
||||
*/
|
||||
private String endTime;
|
||||
|
||||
/**
|
||||
* 充电站累计电量(保留1位小数)
|
||||
* 示例:100.5(单位:kWh)
|
||||
*/
|
||||
private BigDecimal stationElectricity;
|
||||
|
||||
/**
|
||||
* 当前总输出电流(保留2位小数)
|
||||
* 示例:25.30(单位:A)
|
||||
*/
|
||||
private BigDecimal currentOutput;
|
||||
|
||||
/**
|
||||
* 当前总输出电压(保留2位小数)
|
||||
* 示例:380.00(单位:V)
|
||||
*/
|
||||
private BigDecimal voltageOutput;
|
||||
|
||||
/**
|
||||
* 当前总输出功率(保留1位小数)
|
||||
* 示例:95.5(单位:kW)
|
||||
*/
|
||||
private BigDecimal powerOutput;
|
||||
|
||||
/**
|
||||
* 当前总需求电流(保留2位小数)
|
||||
* 示例:30.00(单位:A)
|
||||
*/
|
||||
private BigDecimal currentNeed;
|
||||
|
||||
/**
|
||||
* 当前总需求电压(保留2位小数)
|
||||
* 示例:220.00(单位:V)
|
||||
*/
|
||||
private BigDecimal voltageNeed;
|
||||
|
||||
/**
|
||||
* 当前总需求功率(保留1位小数)
|
||||
* 示例:66.0(单位:kW)
|
||||
*/
|
||||
private BigDecimal powerNeed;
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user