This commit is contained in:
2024-03-06 13:48:40 +08:00
parent 41b7171e70
commit 3d83f32f65
2 changed files with 7 additions and 2 deletions

View File

@@ -368,12 +368,14 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
logger.info("结算订单:{}, 是订单完成状态", orderBasicInfo.getOrderCode());
return;
}
// 获取更新数据后的orderBasicInfo对象
returnUpdateOrderBasicInfo(orderBasicInfo, data);
// 获取更新数据后的orderDetail对象/更新订单详情 查询订单详情 修改订单数据
OrderDetail orderDetail = returnUpdateOrderDetail(orderBasicInfo, data);
// 计算订单折扣 calculateOrderDiscounts
// calculateOrderDiscounts(orderBasicInfo, orderDetail);
// 计算订单折扣
calculateOrderDiscountsV2(orderBasicInfo, orderDetail);
// 更新数据库

View File

@@ -376,10 +376,13 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic {
logger.info("结算订单:{}, 是订单完成状态", orderBasicInfo.getOrderCode());
return;
}
// 获取更新数据后的orderBasicInfo对象
returnUpdateOrderBasicInfo(orderBasicInfo, data);
// 获取更新数据后的orderDetail对象/更新订单详情 查询订单详情 修改订单数据
OrderDetail orderDetail = returnUpdateOrderDetail(orderBasicInfo, data);
// 更新数据库
OrderTransactionDTO dto = new OrderTransactionDTO();
dto.setOrderBasicInfo(orderBasicInfo);