From 79b0012d4ecd75f3bbade72f60fd5f82c9b8f9cb Mon Sep 17 00:00:00 2001 From: zhangli <123879394@qq.com> Date: Tue, 30 Sep 2025 00:49:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E8=AE=A2=E5=8D=95=E5=8D=95=E5=8F=B7?= 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, 3 insertions(+), 3 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 49d18b2..772d619 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(OrderUtil.generateSubOrderNo(OrderUtil.ZF_PREFIX)); + noDepositOrder.setPaymentId(paymentId); noDepositOrder.setSuborderType(SubOrderTypeEnum.NO_DEPOSIT.getCode()); noDepositOrder.setAmount(orderMainPO.getDepositPrice()); noDepositOrder.setCreatedAt(LocalDateTime.now()); @@ -321,7 +321,7 @@ public class OrderServiceImpl implements OrderService { noDepositOrder.setPayStatus(PayStatusEnum.USERPAYING.getCode()); orderSubPOList.add(noDepositOrder); - String paymentId = OrderUtil.generateSubOrderNo(OrderUtil.ZF_PREFIX); + //如果选择了租电套餐，则还需要生成租电子订单 if(rentBatteyRuleDTO!=null){