|
|
|
@@ -512,21 +512,18 @@ public class WxUserGrantController extends BaseController { |
|
|
|
user.setCountryCode(phoneNoInfo.getCountryCode()); |
|
|
|
if (isFirstPhone) { |
|
|
|
//检查是否存在会员信息 如果有 赋值积分 |
|
|
|
List<WxCUserBasicInfo> 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); |
|
|
|
|