新版登录-绑定手机号

yujian

2019-10-09 481da0ca0ac931f6ff35dbb8d70d4450d4252c17

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java

@@ -44,6 +44,7 @@
import com.yeshi.fanli.entity.AppVersionInfo;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.user.AccountMessage;

import com.yeshi.fanli.entity.bus.user.BindRemind;

import com.yeshi.fanli.entity.bus.user.BindingAccount;

import com.yeshi.fanli.entity.bus.user.Extract;

import com.yeshi.fanli.entity.bus.user.ExtractRecord;

@@ -54,8 +55,8 @@
import com.yeshi.fanli.entity.bus.user.UserActiveLog;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.common.Config;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

@@ -90,6 +91,7 @@
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinDetailService;

import com.yeshi.fanli.service.inter.user.AccountMessageService;

import com.yeshi.fanli.service.inter.user.BindRemindService;

import com.yeshi.fanli.service.inter.user.MaskKeyService;

import com.yeshi.fanli.service.inter.user.ShamUserService;

import com.yeshi.fanli.service.inter.user.SpreadUserImgService;

@@ -221,6 +223,9 @@


   @Resource

   private UserInfoModifyRecordService userInfoModifyRecordService;

	
   @Resource

   private BindRemindService bindRemindService;



   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -2151,12 +2156,21 @@
         // 1.6.5 之后返回 微信号提示

         if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))

            userInfo.setWeiXinTip("添加微信号后，你的邀请人和一级队员可以通过微信与你建立联系。");



			
         data.put("user", JsonUtil.getConvertBigDecimalToStringBuilder(gsonBuilder).create().toJson(userInfo));

         data.put("invitCode", invitCode); // 邀请码

         data.put("welfareCenterNews", welfareCenterNews);// 福利中心消息

			
         // 2.0.1之后绑定手机号

         if (VersionUtil.greaterThan_2_0_1(acceptData.getPlatform(), acceptData.getVersion())) {

            boolean bindPhone = false;

            if (StringUtil.isNullOrEmpty(userInfo.getPhone())) 
               bindPhone = bindRemindService.bindRemind(uid, BindRemind.TYPE_PHONE);

            data.put("bindPhone", bindPhone);

         }

			
         out.print(JsonUtil.loadTrueResult(data));



			
         final UserInfo uuser = userInfo;

         ThreadUtil.run(new Runnable() {

            public void run() {