diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index a80ee07e8..af4e7541b 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -512,21 +512,18 @@ public class WxUserGrantController extends BaseController { user.setCountryCode(phoneNoInfo.getCountryCode()); if (isFirstPhone) { //检查是否存在会员信息 如果有 赋值积分 - List basicInfoList = wxCUserBasicInfoService.findInfoByPhone(user.getTenantId(), user.getPhone()); - if (basicInfoList != null && !basicInfoList.isEmpty()) { - WxCUserBasicInfo basicInfo = basicInfoList.get(0); - if(basicInfo != null) { - int credit = user.getCredit() == null ? 0 : user.getCredit(); - int score = user.getScore() == null ? 0 : user.getScore(); - int memScore = basicInfo.getPoins() == null ? 0 : basicInfo.getPoins(); - int memCredit = basicInfo.getCredit() == null ? 0 : basicInfo.getCredit(); - if (memCredit > 0) { - user.setCredit(memCredit); - wxCUserService.addCredit(user, EnumScoreType.MEM_IMPORT); - } - user.setCredit(memCredit + credit); - user.setScore(memScore + score); - } + WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.findInfoByPhone(user.getTenantId(), user.getPhone()); + if (basicInfo != null ) { + int credit = user.getCredit() == null ? 0 : user.getCredit(); + int score = user.getScore() == null ? 0 : user.getScore(); + int memScore = basicInfo.getPoins() == null ? 0 : basicInfo.getPoins(); + int memCredit = basicInfo.getCredit() == null ? 0 : basicInfo.getCredit(); + if (memCredit > 0) { + user.setCredit(memCredit); + wxCUserService.addCredit(user, EnumScoreType.MEM_IMPORT); + } + user.setCredit(memCredit + credit); + user.setScore(memScore + 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 4f4201ba3..6a09bff7c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java @@ -80,7 +80,7 @@ public interface WxCUserBasicInfoService { void deleteById(Long id); List findByPhone(String tenantId, String phone); - List findInfoByPhone(String tenantId, String phone); + WxCUserBasicInfo 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 a5ead34a5..2c518febd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -555,15 +555,16 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { } @Override - public List findInfoByPhone(String tenantId, String phone) { + public WxCUserBasicInfo findInfoByPhone(String tenantId, String phone) { + WxCUserBasicInfo basic = null; WxCUserBasicInfo basicQ = new WxCUserBasicInfo(); basicQ.setTenantId(tenantId); basicQ.setPhone(phone); List basicInfos = wxCUserBasicInfoMapper.select(basicQ); - if (basicInfos != null && basicInfos.size() > 0) { - return basicInfos; + if (basicInfos.size() > 0) { + return basicInfos.get(0); } - return null; + return basic; } @Override