Merge remote-tracking branch 'origin/master'

admin

2019-04-12 45f35a348c6d19f954888bf3e595bdf9d6016bb8

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java

@@ -20,6 +20,7 @@
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;

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

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

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

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

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

import com.yeshi.fanli.entity.system.BusinessSystem;

@@ -46,6 +47,7 @@
import com.yeshi.fanli.service.inter.user.ShamUserService;

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

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

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

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

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

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

@@ -133,7 +135,9 @@


   @Resource

   private UserMoneyService userMoneyService;

	


   @Resource

   private UserAccountBindingHistoryService userAccountBindingHistoryService;



   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -912,6 +916,8 @@
      }

      redisManager.cacheCommonString(key, "1", 120);



		


      // 支付宝绑定

      ForbiddenUserIdentifyCode ic = forbiddenUserIdentifyCodeService

            .listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.alipayAccount, account);

@@ -1106,23 +1112,23 @@
         deviceTokenHWService.unBindDeviceToken(acceptData.getDevice());

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

   }

	
	
	


   /**

    *   新版登录  V1.5.3

    * 新版登录 V1.5.3

    * 
    * @param acceptData

    * @param vcode

    * @param phone

    * @param code

    * @param loginType 登录方式：  1-手机登录   2-微信登录

    * @param loginType

    *            登录方式： 1-手机登录 2-微信登录

    * @param request

    * @param out

    */

   @RequestMapping(value = "loginNew", method = RequestMethod.POST)

   public void loginNew(AcceptData acceptData, String vcode, String phone, String code,

         int loginType, HttpServletRequest request, PrintWriter out) {

		
   public void loginNew(AcceptData acceptData, String vcode, String phone, String code, int loginType,

         HttpServletRequest request, PrintWriter out) {



      try {

         BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

               acceptData.getPackages());

@@ -1130,30 +1136,30 @@
            out.print(JsonUtil.loadFalseResult("系统不存在"));

            return;

         }

			


         UserInfo userInfo = null;

         // 手机登录

         if (loginType == 1) {

            userInfo = userAccountService.loginPhone(request, loginType, vcode, phone, system.getAppid());

         }

			


         // 微信登录

         if (loginType == 2) {

            userInfo = userAccountService.loginWinXin(request,loginType, code, system.getAppid());

            userInfo = userAccountService.loginWinXin(request, loginType, code, system.getAppid());

         }

			


         if (userInfo == null) {

            out.print(JsonUtil.loadFalseResult("登录失败"));

         } else {

            JSONObject data = new JSONObject();

            data.put("userInfo", UserUtil.filterForClientUser(userInfo));

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

				


            final UserInfo uuser = userInfo;

            ThreadUtil.run(new Runnable() {

               public void run() {

                  try {

                     /* 同步未登录之前设备抽奖数据  */

                     /* 同步未登录之前设备抽奖数据 */

                     int platformType = 0;

                     String platform = acceptData.getPlatform();

                     if ("android".equals(platform)) {

@@ -1161,14 +1167,15 @@
                     } else if ("ios".equals(platform)) {

                        platformType = 2;

                     }

                     userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType, acceptData.getDevice());

                     userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType,

                           acceptData.getDevice());

                  } catch (Exception e) {

                     e.printStackTrace();

                  }

               }

            });

         }

			


      } catch (UserAccountException e) {

         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

         try {

@@ -1185,11 +1192,9 @@
         }

      }

   }

	
	


   /**

    *   绑定电话号码  V1.5.3

    * 绑定电话号码 V1.5.3

    * 

    * @param acceptData

    * @param vcode

@@ -1198,7 +1203,7 @@
    */

   @RequestMapping(value = "bindPhoneNew")

   public void bindPhoneNew(AcceptData acceptData, Long uid, String vcode, String phone, PrintWriter out) {

		


      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

      if (system == null) {

@@ -1217,7 +1222,7 @@
      }



      phone = phone.replaceAll(" ", "");

		


      String oldVCode = redisManager.getSMSVCode(phone, SMSHistory.TYPE_BIND);

      if (Constant.IS_OUTNET) {

         if (!vcode.equalsIgnoreCase(oldVCode)) {

@@ -1226,12 +1231,11 @@
         }

         redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_BIND);

      }

		
		


      try {

         // 绑定用户

         userAccountService.bindPhoneNew(uid, phone);

			


         UserInfo user = userInfoService.getUserByIdWithMybatis(uid);

         // 判断电话号码是否已经封禁

         ForbiddenUserIdentifyCode ic = forbiddenUserIdentifyCodeService

@@ -1259,8 +1263,7 @@
         out.print(JsonUtil.loadFalseResult(1, "绑定失败"));

      }

   }

	
	


   /**

    * 更改微信

    * 

@@ -1273,7 +1276,7 @@
   public void bindWeiXin(AcceptData acceptData, Long uid, String code, PrintWriter out) {

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

		


      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

@@ -1286,7 +1289,7 @@


      try {

         userAccountService.bindWeiXin(uid, code);

			


         UserInfo user = userInfoService.getUserByIdWithMybatis(uid);

         // 判断taoBaoUid是否已经封禁

         ForbiddenUserIdentifyCode ic = forbiddenUserIdentifyCodeService