update 预约充电

jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java

@@ -242,6 +242,9 @@ public abstract class AbstractProgramLogic implements InitializingBean {
         BigDecimal orderAmount = orderBasicInfo.getOrderAmount();
         // 更新订单详情 查询订单详情 修改订单数据
         OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode);
+        if (orderDetail == null) {
+            return null;
+        }
         try {
             // 总电费金额
             BigDecimal totalElectricityAmount = BigDecimal.ZERO;
@@ -612,6 +615,12 @@ public abstract class AbstractProgramLogic implements InitializingBean {
         String stationId = orderBasicInfo.getStationId(); // 站点id
         String merchantId = orderBasicInfo.getMerchantId(); // 运营商id
 
+        if (orderDetail == null) {
+            logger.info("计算订单折扣V2, OrderDetail为空(orderCode:{}, transactionCode:{}), 直接返回!",
+                    orderBasicInfo.getOrderCode(), orderBasicInfo.getTransactionCode());
+            return;
+        }
+
         // 原始电费金额
         BigDecimal originalTotalElectricityAmount = orderDetail.getTotalElectricityAmount();
         // 原始服务费金额

jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java

@@ -433,7 +433,8 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
         // 从redis中取出实时记录保存到表中
         realTimeMonitorDataRedis2DB(orderBasicInfo.getTransactionCode(), orderBasicInfo.getOrderCode());
 
-        logger.info("结算订单end:{} OrderTransactionDTO:{}", orderBasicInfo.getOrderCode(), JSON.toJSONString(dto));
+        logger.info("结算订单end! orderCode:{}, transactionCode:{}, OrderTransactionDTO:{}",
+                orderBasicInfo.getOrderCode(), orderBasicInfo.getTransactionCode(), JSON.toJSONString(dto));
     }
 
     /**