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 772d619..87a5174 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,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){ @@ -425,9 +425,12 @@ public class OrderServiceImpl implements OrderService { throw new BizException("无租车待支付单,支付失败"); } //开始发起支付 -// UnifiedPaymentInfoDTO unifiedPaymentInfoDTO = payService.prepayOrder(rentCarOrder.getPaymentMethod(),orderMainPO.getRentCarRuleId().toString(),orderMainPO.getOperatorId(),rentCarOrder.getPaymentId(),userInfoDTO -// ,orderMainPO.getOrderAmount()); - UnifiedPaymentInfoDTO unifiedPaymentInfoDTO = payService.zhimaPayOrder("闪充智行租车免押支付",orderMainPO.getOperatorId(),rentCarOrder.getPaymentId(),noDepositOrder.getTransactionId(),userInfoDTO.getAlipayOpenid(),orderMainPO.getOrderAmount()); + UnifiedPaymentInfoDTO unifiedPaymentInfoDTO = payService.prepayOrder(rentCarOrder.getPaymentMethod(),orderMainPO.getRentCarRuleId().toString(),orderMainPO.getOperatorId(),rentCarOrder.getPaymentId(),userInfoDTO + ,orderMainPO.getOrderAmount()); + + //免押代扣支付-过审验证用 +// UnifiedPaymentInfoDTO unifiedPaymentInfoDTO = payService.zhimaPayOrder("闪充智行租车免押支付",orderMainPO.getOperatorId(),rentCarOrder.getPaymentId() +// ,noDepositOrder.getTransactionId(),userInfoDTO.getAlipayOpenid(),orderMainPO.getOrderAmount()); LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(OrderSubPO::getSuborderId, noDepositOrder.getSuborderId()) .eq(OrderSubPO::getDelFlag, "0")