|
|
|
@@ -14,8 +14,11 @@ import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.domain.vo.WxCUserVo; |
|
|
|
import com.iformall.domain.vo.WxLevelMerchantCVo; |
|
|
|
import com.iformall.enums.*; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.enums.EnumAssignTagsTrigger; |
|
|
|
import com.iformall.enums.EnumLevelConfigDiscountStatus; |
|
|
|
import com.iformall.enums.EnumScoreType; |
|
|
|
import com.iformall.enums.EnumUserType; |
|
|
|
import com.iformall.mapper.WxCUserBasicInfoMapper; |
|
|
|
import com.iformall.service.*; |
|
|
|
import com.iformall.service.wechat.FmOpenService; |
|
|
|
import com.iformall.utils.Constant; |
|
|
|
@@ -89,6 +92,8 @@ public class WxUserGrantController extends BaseController { |
|
|
|
@Autowired |
|
|
|
WxCreditHistoryService wxCreditHistoryService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxCUserBasicInfoMapper wxCUserBasicInfoMapper; |
|
|
|
/** |
|
|
|
* 微信消息服务验证 |
|
|
|
* |
|
|
|
@@ -508,6 +513,19 @@ public class WxUserGrantController extends BaseController { |
|
|
|
user.setPhone(phoneNoInfo.getPhoneNumber()); |
|
|
|
user.setPurePhone(phoneNoInfo.getPurePhoneNumber()); |
|
|
|
user.setCountryCode(phoneNoInfo.getCountryCode()); |
|
|
|
if (isFirstPhone) { |
|
|
|
//检查是否存在会员信息 如果有 赋值积分 |
|
|
|
WxCUserBasicInfo wxCUserBasicInfoQuery = new WxCUserBasicInfo(); |
|
|
|
wxCUserBasicInfoQuery.setPhone(user.getPhone()); |
|
|
|
wxCUserBasicInfoQuery.setTenantId(user.getTenantId()); |
|
|
|
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectOne(wxCUserBasicInfoQuery); |
|
|
|
if (wxCUserBasicInfo != null) { |
|
|
|
int credit = user.getCredit() == null ? 0 : user.getCredit(); |
|
|
|
int score = user.getScore() == null ? 0 : user.getScore(); |
|
|
|
user.setCredit(wxCUserBasicInfo.getCredit() + credit); |
|
|
|
user.setScore(wxCUserBasicInfo.getPoins() + score); |
|
|
|
} |
|
|
|
} |
|
|
|
wxCUserService.saveOrUpdate(user); |
|
|
|
|
|
|
|
if(isFirstPhone) { |
|
|
|
|