diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java index 4b8a781..45cecf2 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java @@ -968,6 +968,9 @@ public class OrderInfoService extends ServiceImpl {},结算方式:{}", ctx.getCompanyUserId(), payMoney, oldBalance, newBalance, ctx.getSettlementWay()); + + // 更新订单支付状态为已支付 + return updateOrderPaymentStatus(orderInfo, ctx, isIn); } } else if (OrderCategory.DuanBoRu.equals(orderInfo.getOrderCategory())) { // 短驳入订单,增加营收 @@ -995,39 +998,33 @@ public class OrderInfoService extends ServiceImpl {}", ctx.getCompanyUserId(), payMoney, oldRevenue, newRevenue); - } - // 更新订单支付状态为已支付 - OrderInfoEntity entity = new OrderInfoEntity(); - entity.setId(orderInfo.getId()); - entity.setPaymentStatus(PaymentStatus.YiZhiFu); - entity.setSettlementWay(ctx.getSettlementWay()); - entity.setPayTime(LocalDateTime.now()); - if (!isIn) { - entity.setOrderStatus(OrderStatus.YiWanCheng); - this.updateById(entity); - return true; - } else { - this.updateById(entity); + // 更新订单支付状态为已支付 + return updateOrderPaymentStatus(orderInfo, ctx, isIn); } } else { // 如果支付金额为0,则直接改状态 // 更新订单支付状态为已支付 - OrderInfoEntity entity = new OrderInfoEntity(); - entity.setId(orderInfo.getId()); - entity.setSettlementWay(ctx.getSettlementWay()); - entity.setPaymentStatus(PaymentStatus.YiZhiFu); - entity.setPayTime(LocalDateTime.now()); - if (!isIn) { - entity.setOrderStatus(OrderStatus.YiWanCheng); - this.updateById(entity); - return true; - } else { - this.updateById(entity); - } + return updateOrderPaymentStatus(orderInfo, ctx, isIn); } return false; } + private boolean updateOrderPaymentStatus(OrderInfoEntity orderInfo, PaymentContextResult ctx, Boolean isIn) { + OrderInfoEntity entity = new OrderInfoEntity(); + entity.setId(orderInfo.getId()); + entity.setPaymentStatus(PaymentStatus.YiZhiFu); + entity.setSettlementWay(ctx.getSettlementWay()); + entity.setPayTime(LocalDateTime.now()); + if (!isIn) { + entity.setOrderStatus(OrderStatus.YiWanCheng); + this.updateById(entity); + return true; + } else { + this.updateById(entity); + return false; + } + } + @Transactional(rollbackFor = Exception.class) public void orderTimeOut() { log.info("检查超时订单");