lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

创建订单计算费用，支付状态不改

localizer
ljw 2025-11-01 09:37:25 +08:00
parent 0310e4971f
commit 4b0c7627fe
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
View File

@ -1165,7 +1165,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
* @param orderId 订单ID * @param orderId 订单ID
* @param items 付费项列表（已经计算好金额） * @param items 付费项列表（已经计算好金额）
*/ */
private void updateOrderTotalMoney(Long orderId, List<OrderExpenseItemsEntity> items, Boolean isChange) { private void updateOrderTotalMoney(Long orderId, List<OrderExpenseItemsEntity> items, Boolean isChange, Boolean isAdd) {
BigDecimal totalDiscountMoney = BigDecimal.ZERO; BigDecimal totalDiscountMoney = BigDecimal.ZERO;
BigDecimal totalReviseMoney = BigDecimal.ZERO; BigDecimal totalReviseMoney = BigDecimal.ZERO;
BigDecimal totalSettleMoney = BigDecimal.ZERO; BigDecimal totalSettleMoney = BigDecimal.ZERO;
@ -1184,23 +1184,22 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
totalChangeMoney = totalChangeMoney.add(change); totalChangeMoney = totalChangeMoney.add(change);
} }
OrderInfoEntity orderInfoEntity = new OrderInfoEntity();
orderInfoEntity.setId(orderId);
// 更新订单表的优惠金额; 手动修正金额;结算金额;总金额; // 更新订单表的优惠金额; 手动修正金额;结算金额;总金额;
if (isChange) { if (isChange) {
this.lambdaUpdate() orderInfoEntity.setChangeMoney(totalChangeMoney);
.eq(OrderInfoEntity::getId, orderId)
.set(OrderInfoEntity::getChangeMoney, totalChangeMoney)
.update();
} else { } else {
this.lambdaUpdate() orderInfoEntity.setDiscountMoney(totalDiscountMoney);
.eq(OrderInfoEntity::getId, orderId) orderInfoEntity.setReviseMoney(totalReviseMoney);
.set(OrderInfoEntity::getDiscountMoney, totalDiscountMoney) orderInfoEntity.setSettleMoney(totalSettleMoney);
.set(OrderInfoEntity::getReviseMoney, totalReviseMoney) orderInfoEntity.setTotalMoney(totalTotalMoney);
.set(OrderInfoEntity::getSettleMoney, totalSettleMoney) if (!isAdd) {
.set(OrderInfoEntity::getTotalMoney, totalTotalMoney) orderInfoEntity.setPaymentStatus(PaymentStatus.WeiZhiFu);
.set(OrderInfoEntity::getPaymentStatus, PaymentStatus.WeiZhiFu)
.update();
} }
} }
this.updateById(orderInfoEntity);
}
/** /**
* 计算付费项列表的金额并更新订单汇总金额 * 计算付费项列表的金额并更新订单汇总金额
@ -1217,7 +1216,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
orderExpenseItemsService.updateBatchById(items); orderExpenseItemsService.updateBatchById(items);
// 更新订单汇总金额 // 更新订单汇总金额
updateOrderTotalMoney(orderId, items, Boolean.FALSE); updateOrderTotalMoney(orderId, items, Boolean.FALSE, Boolean.TRUE);
} }
public void updateOrderItems(Long orderId, Integer settleWeight, Boolean isChange) { public void updateOrderItems(Long orderId, Integer settleWeight, Boolean isChange) {
@ -1236,7 +1235,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
orderExpenseItemsService.updateBatchById(extraItems); orderExpenseItemsService.updateBatchById(extraItems);
// 汇总并更新订单总金额 // 汇总并更新订单总金额
updateOrderTotalMoney(orderId, extraItems, isChange); updateOrderTotalMoney(orderId, extraItems, isChange, Boolean.FALSE);
} }
/** /**