免押支付更换子订单支付号

This commit is contained in:
2025-09-30 00:10:48 +08:00
parent d9fe7405eb
commit 1e95a147e6

View File

@ -309,10 +309,11 @@ public class OrderServiceImpl implements OrderService {
String paymentType = PaymentTypeEnum.ZFB_PAY.getCode(); String paymentType = PaymentTypeEnum.ZFB_PAY.getCode();
List<OrderSubPO> orderSubPOList = new ArrayList<>(); List<OrderSubPO> orderSubPOList = new ArrayList<>();
String paymentId = OrderUtil.generateSubOrderNo(OrderUtil.ZF_PREFIX);
//生成免押订单 //生成免押订单
OrderSubPO noDepositOrder = new OrderSubPO(); OrderSubPO noDepositOrder = new OrderSubPO();
noDepositOrder.setSuborderNo(OrderUtil.generateSubOrderNo(OrderUtil.MY_PREFIX)); noDepositOrder.setSuborderNo(OrderUtil.generateSubOrderNo(OrderUtil.MY_PREFIX));
noDepositOrder.setPaymentId(OrderUtil.generateSubOrderNo(OrderUtil.FZ_PREFIX)); noDepositOrder.setPaymentId(paymentId);
noDepositOrder.setSuborderType(SubOrderTypeEnum.NO_DEPOSIT.getCode()); noDepositOrder.setSuborderType(SubOrderTypeEnum.NO_DEPOSIT.getCode());
noDepositOrder.setAmount(orderMainPO.getDepositPrice()); noDepositOrder.setAmount(orderMainPO.getDepositPrice());
noDepositOrder.setCreatedAt(LocalDateTime.now()); noDepositOrder.setCreatedAt(LocalDateTime.now());
@ -320,7 +321,6 @@ public class OrderServiceImpl implements OrderService {
noDepositOrder.setPayStatus(PayStatusEnum.USERPAYING.getCode()); noDepositOrder.setPayStatus(PayStatusEnum.USERPAYING.getCode());
orderSubPOList.add(noDepositOrder); orderSubPOList.add(noDepositOrder);
String paymentId = OrderUtil.generateSubOrderNo(OrderUtil.ZF_PREFIX);
//如果选择了租电套餐,则还需要生成租电子订单 //如果选择了租电套餐,则还需要生成租电子订单
if(rentBatteyRuleDTO!=null){ if(rentBatteyRuleDTO!=null){
rentBatteyRuleDTO = carInteg.getRentBatteyRuleByBatteyRuleId(rentCarOrderReq.getRentBatteyRuleId()); rentBatteyRuleDTO = carInteg.getRentBatteyRuleByBatteyRuleId(rentCarOrderReq.getRentBatteyRuleId());