From 683b6809e595f0db5976a44ea914115090212fd8 Mon Sep 17 00:00:00 2001 From: Burce Date: Tue, 3 Sep 2019 15:58:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=97=A5=E7=A7=AF=E5=88=86:clear?= =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxCreditHistoryServiceImpl.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index f92793b48..4ce9ab5fa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -216,10 +216,19 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { int creditChangeNumOrigin = creditIncrement(record); int creditChangeNum = creditChangeNumOrigin ; + //是否参与了生日积分倍率 + boolean hasBirthDateCredit = false; if (record.getCreditType().equals(EnumScoreType.CONSUMPTION.getCode()) || record.getCreditType().equals(EnumScoreType.SPEND_CREDIT.getCode())) { //等级积分配置 Integer levelScale = wxLevelConfigMapper.getScale(wxCUser.getTenantId(), wxCUser.getScore()); - creditChangeNum = CreditUtil.calUserCredit(creditChangeNumOrigin, wxCUser, levelScale, wxCUserBasicInfo, wxScoreRulesService); + try { + creditChangeNum = CreditUtil.calUserCredit(creditChangeNumOrigin, wxCUser, levelScale, wxCUserBasicInfo, wxScoreRulesService); + if (Objects.nonNull(CreditUtil.getIsBirthDayScale())) { + hasBirthDateCredit = true; + } + } finally { + CreditUtil.clear(); + } } if (creditChangeNum != 0) { @@ -252,11 +261,10 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { wxCUserBasicInfoNew.setId(wxCUserBasicInfo.getId()); wxCUserBasicInfoNew.setCredit(record.getCreditAmount()); //如果享受了生日积分倍率,记录日期 - if(Objects.nonNull(CreditUtil.getIsBirthDayScale())) { + if (hasBirthDateCredit) { wxCUserBasicInfoNew.setScoreDate(new Date()); } wxCUserBasicInfoMapper.updateByPrimaryKeySelective(wxCUserBasicInfoNew); - CreditUtil.clear(); } } else {