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);