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-25 02:06:31 +08:00
parent edd2d6e728
commit 1814c5c199
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,13 +275,13 @@ public class OrderServiceImpl implements OrderService {
//获取续租车金额 //获取续租车金额
BigDecimal rentCarOrderAmount = OrderUtil.getReRentCarAmount(rerentInterval, orderMainPO.getRentalPrice()); BigDecimal rentCarOrderAmount = OrderUtil.getReRentCarAmount(rerentInterval, orderMainPO.getRentalPrice());
//获取租电金额 //获取租电金额
BigDecimal rentBatteyOrderAmount = BigDecimal.ZERO ; // BigDecimal rentBatteyOrderAmount = BigDecimal.ZERO ;
RentBatteyRuleDTO rentBatteyRuleDTO = null; // RentBatteyRuleDTO rentBatteyRuleDTO = null;
if(orderMainPO.getRentBatteyRuleId()!=null) { // if(orderMainPO.getRentBatteyRuleId()!=null) {
rentBatteyRuleDTO = carInteg.getRentBatteyRuleByBatteyRuleId(orderMainPO.getRentBatteyRuleId()); // rentBatteyRuleDTO = carInteg.getRentBatteyRuleByBatteyRuleId(orderMainPO.getRentBatteyRuleId());
rentBatteyOrderAmount = Optional.ofNullable(rentBatteyRuleDTO).map(RentBatteyRuleDTO::getRentPrice).orElse(BigDecimal.ZERO); // rentBatteyOrderAmount = Optional.ofNullable(rentBatteyRuleDTO).map(RentBatteyRuleDTO::getRentPrice).orElse(BigDecimal.ZERO);
rentCarOrderAmount = rentCarOrderAmount.add(rentBatteyOrderAmount); // rentCarOrderAmount = rentCarOrderAmount.add(rentBatteyOrderAmount);
} // }
String paymentId = OrderUtil.generateSubOrderNo(OrderUtil.ZF_PREFIX); String paymentId = OrderUtil.generateSubOrderNo(OrderUtil.ZF_PREFIX);
// 起支付返回预支付信息 // 起支付返回预支付信息
RentCarRuleDTO rentCarRuleDTO = carInteg.getRentCarRuleByCarRuleId(orderMainPO.getRentCarRuleId()); RentCarRuleDTO rentCarRuleDTO = carInteg.getRentCarRuleByCarRuleId(orderMainPO.getRentCarRuleId());
@ -307,19 +307,19 @@ public class OrderServiceImpl implements OrderService {
orderSubRepo.save(rentOrder); orderSubRepo.save(rentOrder);
//生成租电子订单 //生成租电子订单
if(rentBatteyOrderAmount.compareTo(BigDecimal.ZERO)>0){ // if(rentBatteyOrderAmount.compareTo(BigDecimal.ZERO)>0){
//生成租电子订单 // //生成租电子订单
OrderSubPO rentBatraayOrder = new OrderSubPO(); // OrderSubPO rentBatraayOrder = new OrderSubPO();
rentBatraayOrder.setOrderId(orderMainPO.getOrderId()); // rentBatraayOrder.setOrderId(orderMainPO.getOrderId());
rentBatraayOrder.setSuborderNo(OrderUtil.generateSubOrderNo(OrderUtil.ZC_PREFIX)); // rentBatraayOrder.setSuborderNo(OrderUtil.generateSubOrderNo(OrderUtil.ZC_PREFIX));
rentBatraayOrder.setPaymentId(paymentId); // rentBatraayOrder.setPaymentId(paymentId);
rentBatraayOrder.setSuborderType(SubOrderTypeEnum.RENTBATTEY.getCode()); // rentBatraayOrder.setSuborderType(SubOrderTypeEnum.RENTBATTEY.getCode());
rentBatraayOrder.setAmount(rentBatteyOrderAmount); // rentBatraayOrder.setAmount(rentBatteyOrderAmount);
rentBatraayOrder.setCreatedAt(LocalDateTime.now()); // rentBatraayOrder.setCreatedAt(LocalDateTime.now());
rentBatraayOrder.setPaymentMethod(paymentType); // rentBatraayOrder.setPaymentMethod(paymentType);
rentBatraayOrder.setPayStatus(PayStatusEnum.USERPAYING.getCode()); // rentBatraayOrder.setPayStatus(PayStatusEnum.USERPAYING.getCode());
orderSubRepo.save(rentBatraayOrder); // orderSubRepo.save(rentBatraayOrder);
} // }