sczx_group/sczx_order
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

改回统一下单支付

Browse Source
This commit is contained in:
zhangli
2025-09-30 01:45:55 +08:00
parent 6aa0cb4834
commit d627e9ed42
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
View File

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