From 9f662096f6eba9a1cf8092733e34d144ec7e5908 Mon Sep 17 00:00:00 2001 From: hanxueda Date: Fri, 12 Apr 2019 10:18:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=80=BB=E7=A7=AF=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxCreditHistoryServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 b11d822db..d7c7fb7f0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -143,9 +143,9 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { //int currentCreditAmount = wxCreditHistoryMapper.creditAmount(record.getCUserId()); int currentCreditAmount = 0; //获取当前用户总积分规则:优先获取wxCUserBasicInfo中数据 若不存在 再获取wxCUser表中数据 - if (wxCUserBasicInfo != null && wxCUserBasicInfo.getCredit() > 0) { + if (wxCUserBasicInfo != null && wxCUserBasicInfo.getCredit() != null && wxCUserBasicInfo.getCredit() > 0) { currentCreditAmount = wxCUserBasicInfo.getCredit(); - } else if (wxCUser != null && wxCUser.getCredit() > 0) { + } else if (wxCUser != null && wxCUser.getCredit() != null && wxCUser.getCredit() > 0) { currentCreditAmount = wxCUser.getCredit(); }