From f1fd0804a815b714a4ae3f51f98e466c02fc7164 Mon Sep 17 00:00:00 2001 From: Burce Date: Tue, 17 Sep 2019 16:09:12 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=E7=A7=AF=E5=88=86=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/utils/CreditUtil.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java b/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java index 5ef4ef50d..48ffd24b1 100644 --- a/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java @@ -36,7 +36,20 @@ public class CreditUtil { .divide(new BigDecimal(WxScoreRules.DEFAULT_SCALE)) .divide(new BigDecimal(WxLevelConfig.DEFAULT_SCALE) , BigDecimal.ROUND_HALF_UP).intValue(); - log.info("积分倍率计算, 用户:{},成长值:{},等级积分倍率:{},生日积分倍率:{},原积分:{},新积分:{}", wxCUser.getId(), wxCUser.getScore(), levelScale, birthdayScale, creditOrigin, creditNew); + Long userId = null; + Integer score = null; + if (Objects.nonNull(wxCUser)) { + userId = wxCUser.getId(); + score = wxCUser.getScore(); + } + if (Objects.isNull(userId)) { + userId = wxCUserBasicInfo.getId(); + } + + if (Objects.isNull(score)) { + score = wxCUserBasicInfo.getPoins(); + } + log.info("积分倍率计算, 用户:{},成长值:{},等级积分倍率:{},生日积分倍率:{},原积分:{},新积分:{}", userId, score, levelScale, birthdayScale, creditOrigin, creditNew); return creditNew; }