Merge branch 'dev-g' into dev

This commit is contained in:
Guoqs
2025-06-03 15:26:13 +08:00
2 changed files with 33 additions and 2 deletions

View File

@@ -1109,8 +1109,8 @@ public abstract class AbstractProgramLogic implements InitializingBean {
orderDetail.setDiscountElectricityAmount(electricityAmountDiscount);
// 服务费折扣金额(服务费便宜了多少钱)
orderDetail.setDiscountServiceAmount(serviceAmountDiscount);
logger.info("计算订单折扣V2, orderCode:{}, memberId:{}, 订单折扣金额:{}, 电费折扣金额:{}, 服务费折扣金额:{}, 优惠后总消费金额:{}",
orderCode, memberId, discountAmount, electricityAmountDiscount, serviceAmountDiscount, totalConsumeAmount);
logger.info("计算订单折扣V2, orderCode:{}, memberId:{}, 订单折扣金额:{}, 电费折扣金额:{}, 服务费折扣金额:{}, 优惠后总消费金额:{}, 更新后退款金额:{}",
orderCode, memberId, discountAmount, electricityAmountDiscount, serviceAmountDiscount, totalConsumeAmount, refundAmount);
}
/**