admin
2019-11-03 788deca1b4a24f8a24e49c24f7d89975a1d74bbe
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
@@ -25,8 +25,10 @@
import com.yeshi.fanli.service.inter.push.DeviceActiveService;
import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;
import com.yeshi.fanli.service.inter.push.DeviceTokenOPPOService;
import com.yeshi.fanli.service.inter.push.DeviceTokenVIVOService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
import com.yeshi.fanli.service.inter.user.BindRemindService;
import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
@@ -43,7 +45,6 @@
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
@@ -93,6 +94,9 @@
   private DeviceTokenOPPOService deviceTokenOPPOService;
   @Resource
   private DeviceTokenVIVOService deviceTokenVIVOService;
   @Resource
   private TaoBaoUnionConfigService taoBaoUnionConfigService;
   @Resource
@@ -128,7 +132,8 @@
   @Resource
   private DeviceActiveService deviceActiveService;
   @Resource
   private BindRemindService bindRemindService;
   /**
    * 新版登录 V1.5.3
@@ -143,7 +148,7 @@
    * @param out
    */
   @RequestMapping(value = "login", method = RequestMethod.POST)
   public void login(AcceptData acceptData, int loginType, String vcode, String phone, String code,
   public void login(AcceptData acceptData, int loginType, String vcode, String phone, String code,
         HttpServletRequest request, PrintWriter out) {
      try {
         BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
@@ -182,19 +187,11 @@
                     LogHelper.errorDetailInfo(e);
                  }
                  if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
                     /* 新人红包 */
                     try {
                        userTaoLiJinOriginService.synchDeviceHongbao(uuser.getId(), device);
                     } catch (Exception e) {
                        e.printStackTrace();
                     }
                  }
                  // 绑定oppo推送
                  // 绑定oppo,VIVO推送
                  DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
                  if (active != null) {
                     deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
                     deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());
                  }
               }
            });
@@ -217,7 +214,7 @@
               e1.printStackTrace();
            }
         }
      } catch (Exception e) {
         out.print(JsonUtil.loadFalseResult("登录失败"));
         try {
@@ -228,8 +225,6 @@
      }
   }
   /**
    * 绑定电话号码 V2.0.1 微信登录
    * 
@@ -240,7 +235,8 @@
    */
   @RequestSerializableByKey(key = "'bindPhoneLogin-'+#phone")
   @RequestMapping(value = "bindPhoneLogin")
   public void bindPhoneLogin(AcceptData acceptData,String vcode, String phone, String key, HttpServletRequest request, PrintWriter out) {
   public void bindPhoneLogin(AcceptData acceptData, String vcode, String phone, String key,
         HttpServletRequest request, PrintWriter out) {
      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
            acceptData.getPackages());
      if (system == null) {
@@ -262,7 +258,7 @@
         out.print(JsonUtil.loadFalseResult("key值不能为空"));
         return;
      }
      phone = phone.replaceAll(" ", "");
      String oldVCode = redisManager.getSMSVCode(phone, SMSHistory.TYPE_BIND);
@@ -286,5 +282,24 @@
         out.print(JsonUtil.loadFalseResult(1, "绑定失败"));
      }
   }
   /**
    * 绑定电话号码 V2.0.1 微信登录
    *
    * @param acceptData
    * @param vcode
    * @param phone
    * @param out
    */
   @RequestMapping(value = "recordBind")
   public void recordBind(AcceptData acceptData, Long uid, PrintWriter out) {
      if (uid == null || uid <= 0) {
         out.print(JsonUtil.loadFalseResult("用户id为空"));
         return;
      }
      bindRemindService.addBindPhone(uid);
      out.print(JsonUtil.loadTrueResult("记录成功"));
   }
}