autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-12 11:19:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

update订单状态和枪口状态

Browse Source
This commit is contained in:
YAS\29473
2025-06-19 16:36:25 +08:00
parent 2a1babb9c9
commit f316be9071
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderStatusEnum.java
View File

@@ -1,5 +1,6 @@
package com.jsowell.common.enums.ykc; package com.jsowell.common.enums.ykc;
import java.util.Objects;
/** /**
* order_basic_info表 order_status字段 * order_basic_info表 order_status字段
* 订单状态(0-未启动；1-充电中；2-待结算；3-待补缴；4-异常；5-可疑；6-订单完成；7-超时关闭) * 订单状态(0-未启动；1-充电中；2-待结算；3-待补缴；4-异常；5-可疑；6-订单完成；7-超时关闭)
@@ -48,4 +49,21 @@ public enum OrderStatusEnum {
} }
return ""; return "";
} }
// 中电联订单状态转化
public static Integer convertToNewStatus(String orderStatus) {
if (Objects.equals(orderStatus , IN_THE_CHARGING.value)) {
return 2; // 充电中
} else if (Objects.equals(orderStatus , ORDER_COMPLETE.value)) {
return 4; // 充电完成
} else if (Objects.equals(orderStatus , NOT_START.value)) {
return 1; // 启动中
} else if (Objects.equals(orderStatus , STAY_SETTLEMENT.value) || Objects.equals(orderStatus , STAY_RETROACTIVE_AMOUNT.value)) {
return 3; // 停止中
} else {
return 5; // 未知
}
}
} }

10
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java vendored
View File

@@ -585,11 +585,17 @@ public class ChangZhouPlatformServiceImpl implements ThirdPartyPlatformService {
BigDecimal totalElectricityAmount = orderDetail.getTotalElectricityAmount() == null ? BigDecimal.ZERO : orderDetail.getTotalElectricityAmount(); BigDecimal totalElectricityAmount = orderDetail.getTotalElectricityAmount() == null ? BigDecimal.ZERO : orderDetail.getTotalElectricityAmount();
BigDecimal totalServiceAmount = orderDetail.getTotalServiceAmount() == null ? BigDecimal.ZERO : orderDetail.getTotalServiceAmount(); BigDecimal totalServiceAmount = orderDetail.getTotalServiceAmount() == null ? BigDecimal.ZERO : orderDetail.getTotalServiceAmount();
Integer orderStatus = OrderStatusEnum.convertToNewStatus(orderInfo.getOrderStatus());
Integer connectorStatus = info.getStatus();
if (orderStatus ==0) {
orderStatus = 5;
}
QueryChargingStatusVO vo = QueryChargingStatusVO.builder() QueryChargingStatusVO vo = QueryChargingStatusVO.builder()
.startChargeSeq(orderInfo.getOrderCode()) // 订单号 .startChargeSeq(orderInfo.getOrderCode()) // 订单号
.startChargeSeqStat(Integer.parseInt(orderInfo.getOrderStatus())) // 订单状态 .startChargeSeqStat(orderStatus) // 订单状态
.connectorID(orderInfo.getPileConnectorCode()) // 枪口编码 .connectorID(orderInfo.getPileConnectorCode()) // 枪口编码
.connectorStatus(info.getStatus()) // 枪口状态 .connectorStatus(connectorStatus) // 枪口状态
.currentA(current) // 电流 .currentA(current) // 电流
.voltageA(voltage) // 电压 .voltageA(voltage) // 电压
.soc(new BigDecimal(soc)) .soc(new BigDecimal(soc))