diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/SettlementUploadHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/SettlementUploadHandler.java index 4fb37c834..87f35a543 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/SettlementUploadHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/SettlementUploadHandler.java @@ -97,17 +97,11 @@ public class SettlementUploadHandler extends AbstractEBikeHandler { if (StringUtils.equals(OrderStatusEnum.ABNORMAL.getValue(), orderBasicInfo.getOrderStatus())) { orderBasicInfo.setOrderStatus(OrderStatusEnum.STAY_SETTLEMENT.getValue()); } - - // 校验结束时间 - if (orderBasicInfo.getChargeEndTime().before(orderBasicInfo.getChargeStartTime())) { - orderBasicInfo.setChargeEndTime(new Date()); - } - + // 结束时间 + orderBasicInfo.setChargeEndTime(new Date()); orderBasicInfoService.updateOrderBasicInfo(orderBasicInfo); - // 重新查询订单信息 orderBasicInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode); - // 结算订单操作 try { // 新逻辑