From 46fa58a78a14da181c42a03e09241dfcb08b5b75 Mon Sep 17 00:00:00 2001 From: zhangli <123879394@qq.com> Date: Tue, 30 Sep 2025 00:19:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sczx/order/service/impl/OrderServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 93b38a6..49d18b2 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -309,11 +309,11 @@ public class OrderServiceImpl implements OrderService { String paymentType = PaymentTypeEnum.ZFB_PAY.getCode(); List orderSubPOList = new ArrayList<>(); - String paymentId = OrderUtil.generateSubOrderNo(OrderUtil.ZF_PREFIX); + //生成免押订单 OrderSubPO noDepositOrder = new OrderSubPO(); noDepositOrder.setSuborderNo(OrderUtil.generateSubOrderNo(OrderUtil.MY_PREFIX)); - noDepositOrder.setPaymentId(paymentId); + noDepositOrder.setPaymentId(OrderUtil.generateSubOrderNo(OrderUtil.ZF_PREFIX)); noDepositOrder.setSuborderType(SubOrderTypeEnum.NO_DEPOSIT.getCode()); noDepositOrder.setAmount(orderMainPO.getDepositPrice()); noDepositOrder.setCreatedAt(LocalDateTime.now()); @@ -321,6 +321,8 @@ public class OrderServiceImpl implements OrderService { noDepositOrder.setPayStatus(PayStatusEnum.USERPAYING.getCode()); orderSubPOList.add(noDepositOrder); + String paymentId = OrderUtil.generateSubOrderNo(OrderUtil.ZF_PREFIX); + //如果选择了租电套餐，则还需要生成租电子订单 if(rentBatteyRuleDTO!=null){ rentBatteyRuleDTO = carInteg.getRentBatteyRuleByBatteyRuleId(rentCarOrderReq.getRentBatteyRuleId());