skyline 2 years ago
parent
commit
48312dddfb

+ 3 - 3
service/src/main/java/com/kym/service/enplus/impl/EnNotifyServiceImpl.java

@@ -73,8 +73,8 @@ public class EnNotifyServiceImpl implements EnNotifyService {
         var obj = JSONObject.parseObject(data);
         var startChargeSeq = obj.getString("StartChargeSeq");
         var startChargeSeqStat = obj.getIntValue("StartChargeSeqStat");
-        var connectorId = obj.getString("connectorID");
-        var startTime = obj.getString("StartTime");
+        var connectorId = obj.getString("ConnectorID");
+        var startTime = LocalDateTime.parse(obj.getString("StartTime"), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
 
         // 更新订单状态
         UpdateWrapper<ChargeOrder> updateWrapper = new UpdateWrapper<>();
@@ -168,7 +168,7 @@ public class EnNotifyServiceImpl implements EnNotifyService {
         var startChargeSeq = data.getString("StartChargeSeq");
         var chargeOrder = chargeOrderService.getChargingOrderByStartChargeSeq(startChargeSeq);
         // EN+平台推送重试策略是当天失败第二天再推送一次,仅此一次。EN+订单页面可以多次手动推送,所以这里要先判断订单状态,避免重复处理。
-        if (chargeOrder.getOrderStatus() != 4) {
+        if (chargeOrder.getChargeStatus() != 4) {
             // 更新订单信息
             chargeOrder.setEndTime(LocalDateTime.parse(data.getString("EndTime"), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             chargeOrder.setTotalPower(data.getDoubleValue("TotalPower"));