admin
2019-04-12 8eacbd15374d01296926e87be3125731521000ee
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;
@@ -134,6 +136,8 @@
   @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);
@@ -1107,21 +1113,21 @@
      out.print(JsonUtil.loadTrueResult(""));
   }
   
   /**
    *   新版登录  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(),
@@ -1161,7 +1167,8 @@
                     } 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();
                  }
@@ -1185,8 +1192,6 @@
         }
      }
   }
   /**
    *   绑定电话号码  V1.5.3
@@ -1227,7 +1232,6 @@
         redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_BIND);
      }
      
      try {
         // 绑定用户
         userAccountService.bindPhoneNew(uid, phone);
@@ -1259,7 +1263,6 @@
         out.print(JsonUtil.loadFalseResult(1, "绑定失败"));
      }
   }
   
   /**
    * 更改微信