From 4f439e0f68b84fb0c25c31579ce09590a2fa2d4a Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sun, 30 Jun 2019 02:58:11 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=A8=E6=88=B7=E6=8E=88=E6=9D=83=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7][=E4=BF=AE=E6=94=B9]:=E7=A7=AF=E5=88=86+?= =?UTF-8?q?=E6=88=90=E9=95=BF=E5=80=BC=E4=B8=8E=E5=AF=BC=E5=85=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxUserGrantController.java | 12 +++++++----- .../iformall/service/WxCUserBasicInfoService.java | 1 + .../service/impl/WxCUserBasicInfoServiceImpl.java | 12 ++++++++++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index a27bafc06..ce7e4dc23 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -513,13 +513,15 @@ public class WxUserGrantController extends BaseController { user.setCountryCode(phoneNoInfo.getCountryCode()); if (isFirstPhone) { //检查是否存在会员信息 如果有 赋值积分 - List basicInfoList = wxCUserBasicInfoService.findByPhone(user.getTenantId(), user.getPhone()); + List basicInfoList = wxCUserBasicInfoService.findInfoByPhone(user.getTenantId(), user.getPhone()); if (basicInfoList.size() > 0) { WxCUserBasicInfo basicInfo = basicInfoList.get(0); - int credit = user.getCredit() == null ? 0 : user.getCredit(); - int score = user.getScore() == null ? 0 : user.getScore(); - user.setCredit(basicInfo.getCredit() + credit); - user.setScore(basicInfo.getPoins() + score); + if(basicInfo != null) { + int credit = user.getCredit() == null ? 0 : user.getCredit(); + int score = user.getScore() == null ? 0 : user.getScore(); + user.setCredit(basicInfo.getCredit() + credit); + user.setScore(basicInfo.getPoins() + score); + } } } wxCUserService.saveOrUpdate(user); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java index 39d31a292..4f4201ba3 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java @@ -80,6 +80,7 @@ public interface WxCUserBasicInfoService { void deleteById(Long id); List findByPhone(String tenantId, String phone); + List findInfoByPhone(String tenantId, String phone); /** * 修改会员积分 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 63d9b3edd..a5ead34a5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -554,6 +554,18 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { return basicInfos; } + @Override + public List findInfoByPhone(String tenantId, String phone) { + WxCUserBasicInfo basicQ = new WxCUserBasicInfo(); + basicQ.setTenantId(tenantId); + basicQ.setPhone(phone); + List basicInfos = wxCUserBasicInfoMapper.select(basicQ); + if (basicInfos != null && basicInfos.size() > 0) { + return basicInfos; + } + return null; + } + @Override public void updateScore(WxCUserBasicInfo record) { wxCUserBasicInfoMapper.updateScore(record);