diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java index 46cf5e9b3..2dcfebc43 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java @@ -626,6 +626,9 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { orderBasicInfoService.updateOrderBasicInfo(orderBasicInfo); + // 重新查询订单信息 + orderBasicInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode); + // 结算订单操作 try { // 新逻辑 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java index ce1f6cf98..1768e1614 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java @@ -557,7 +557,7 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic pileReservationInfo.setEndTime(Time.valueOf("23:00:00")); pileReservationInfo.setVerifyIdentity(Constants.ZERO); pileReservationInfo.setStatus(Constants.ZERO); - pileReservationInfo.setDelFlag("0"); + pileReservationInfo.setDelFlag(DelFlagEnum.NORMAL.getValue()); pileReservationInfoMapper.insert(pileReservationInfo); log.info("未查询到个人桩预约信息, 初始化个人桩预约信息:{}", JSON.toJSONString(pileReservationInfo)); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java index 6eddcf9b7..9862c2fab 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java @@ -196,6 +196,7 @@ public abstract class AbstractProgramLogic implements InitializingBean { BigDecimal orderAmount = new BigDecimal(data.getConsumptionAmount()).setScale(2, RoundingMode.HALF_UP); // 付款金额 - 实际消费金额,如果有剩余,需要走退款操作 当使用余额支付时payAmount = principalPay + giftPay BigDecimal payAmount = orderBasicInfo.getPayAmount(); + logger.info("结算订单:【{}】, 支付金额:{}, 消费金额:{}", orderCode, payAmount, orderAmount); // 有时候充电桩到达金额停止充电会多出一点金额,比如实际需要充50元的电,充电桩传来的消费金额为50.01元,在后台记录的时候需要舍去 if (orderAmount.compareTo(payAmount) > 0) {