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

localizer
ljw 2025-11-01 09:37:25 +08:00
parent 0310e4971f
commit 4b0c7627fe
1 changed files with 14 additions and 15 deletions

View File

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