订单号变更
This commit is contained in:
@ -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,6 +321,8 @@ 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());
|
||||||
|
|||||||
Reference in New Issue
Block a user