diff --git a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java index 2c5a327..3fe186b 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -300,7 +300,7 @@ public class OrderServiceImpl implements OrderService { String paymentType = PaymentTypeEnum.ZFB_PAY.getCode(); List orderSubPOList = new ArrayList<>(); - //如果未开通免押则要生成押金订单 + //生成免押订单 OrderSubPO depositOrder = new OrderSubPO(); depositOrder.setSuborderNo(OrderUtil.generateSubOrderNo(OrderUtil.MY_PREFIX)); depositOrder.setSuborderType(SubOrderTypeEnum.NO_DEPOSIT.getCode()); @@ -340,7 +340,13 @@ public class OrderServiceImpl implements OrderService { for(OrderSubPO orderSubPO : orderSubPOList){ orderSubPO.setPaymentId(paymentId); - orderSubPO.setPayStatus(PayStatusEnum.USERPAYING.getCode()); + //发起免押冻结后,免押订单状态设置为待支付,其他子订单都为初始状态,等待支付 + if(StringUtils.equalsIgnoreCase(orderSubPO.getSuborderType(), SubOrderTypeEnum.NO_DEPOSIT.getCode())){ + orderSubPO.setPayStatus(PayStatusEnum.USERPAYING.getCode()); + } else { + orderSubPO.setPayStatus(PayStatusEnum.INIT.getCode()); + } + } orderMainRepo.save(orderMainPO);