From b0de317525196e7a7150eaba928a4903cefc49b5 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 22 Apr 2025 14:50:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/pile/service/impl/MemberGroupServiceImpl.java | 2 ++ .../pile/service/programlogic/AbstractProgramLogic.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java index 4177090e0..e0a50aafc 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java @@ -194,11 +194,13 @@ public class MemberGroupServiceImpl implements MemberGroupService { public MemberDiscountVO queryMemberDiscountV2(String merchantId, String stationId, String memberId) { String groupCode = memberGroupMapper.queryMemberGroupCode(merchantId, stationId, memberId); if (StringUtils.isBlank(groupCode)) { + log.info("会员:{}, 在运营商:{}, 站点:{}, 没有关联集团", memberId, merchantId, stationId); return null; } // 查询站点的集团会员计费模板 BillingTemplateVO billingTemplate = pileBillingTemplateService.queryPreferentialBillingTemplate(stationId); if (billingTemplate == null) { + log.info("会员:{}, 在运营商:{}, 站点:{}, 没有集团会员计费模板",memberId, merchantId, stationId); return null; } MemberDiscountVO memberDiscountVOBuilder = MemberDiscountVO.builder() diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java index c470f144d..7e75c5b3d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java @@ -1054,8 +1054,8 @@ public abstract class AbstractProgramLogic implements InitializingBean { // 服务费折扣金额 = 优惠前服务费 - 优惠后服务费 serviceAmountDiscount = originalTotalServiceAmount.subtract(afterDiscountServiceAmount); - logger.info("计算订单折扣V2, orderCode:{}, 原始电费金额:{}, 折扣后电费金额:{}, 电费折扣金额:{}, 原始服务费金额:{}, 折扣后服务费金额:{}, 服务费折扣金额:{}", - orderCode, originalTotalElectricityAmount, afterDiscountElectricityAmount, electricityAmountDiscount, originalTotalServiceAmount, afterDiscountServiceAmount, serviceAmountDiscount); + // logger.info("计算订单折扣V2, orderCode:{}, 原始电费金额:{}, 折扣后电费金额:{}, 电费折扣金额:{}, 原始服务费金额:{}, 折扣后服务费金额:{}, 服务费折扣金额:{}", + // orderCode, originalTotalElectricityAmount, afterDiscountElectricityAmount, electricityAmountDiscount, originalTotalServiceAmount, afterDiscountServiceAmount, serviceAmountDiscount); } // 如果总耗电量大于0, 并且各个时段耗电量总和为0, 则优惠后金额等于优惠前金额