| @@ -92,8 +92,6 @@ public class WxUserGrantController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| WxCreditHistoryService wxCreditHistoryService; | WxCreditHistoryService wxCreditHistoryService; | ||||
| @Autowired | |||||
| WxCUserBasicInfoMapper wxCUserBasicInfoMapper; | |||||
| /** | /** | ||||
| * 微信消息服务验证 | * 微信消息服务验证 | ||||
| * | * | ||||
| @@ -515,15 +513,13 @@ public class WxUserGrantController extends BaseController { | |||||
| user.setCountryCode(phoneNoInfo.getCountryCode()); | user.setCountryCode(phoneNoInfo.getCountryCode()); | ||||
| if (isFirstPhone) { | if (isFirstPhone) { | ||||
| //检查是否存在会员信息 如果有 赋值积分 | //检查是否存在会员信息 如果有 赋值积分 | ||||
| WxCUserBasicInfo wxCUserBasicInfoQuery = new WxCUserBasicInfo(); | |||||
| wxCUserBasicInfoQuery.setPhone(user.getPhone()); | |||||
| wxCUserBasicInfoQuery.setTenantId(user.getTenantId()); | |||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectOne(wxCUserBasicInfoQuery); | |||||
| if (wxCUserBasicInfo != null) { | |||||
| List<WxCUserBasicInfo> basicInfoList = wxCUserBasicInfoService.findByPhone(user.getTenantId(), user.getPhone()); | |||||
| if (basicInfoList.size() > 0) { | |||||
| WxCUserBasicInfo basicInfo = basicInfoList.get(0); | |||||
| int credit = user.getCredit() == null ? 0 : user.getCredit(); | int credit = user.getCredit() == null ? 0 : user.getCredit(); | ||||
| int score = user.getScore() == null ? 0 : user.getScore(); | int score = user.getScore() == null ? 0 : user.getScore(); | ||||
| user.setCredit(wxCUserBasicInfo.getCredit() + credit); | |||||
| user.setScore(wxCUserBasicInfo.getPoins() + score); | |||||
| user.setCredit(basicInfo.getCredit() + credit); | |||||
| user.setScore(basicInfo.getPoins() + score); | |||||
| } | } | ||||
| } | } | ||||
| wxCUserService.saveOrUpdate(user); | wxCUserService.saveOrUpdate(user); | ||||