admin
2018-12-22 93c629bfb624e1e88875adb8866e0552b0f36c31
fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
@@ -31,7 +31,6 @@
import com.yeshi.fanli.service.inter.config.InviteGetMoneyService;
import com.yeshi.fanli.service.inter.config.SystemService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoMessageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.order.LostOrderService;
@@ -43,8 +42,6 @@
import com.yeshi.fanli.service.inter.user.AccountMessageService;
import com.yeshi.fanli.service.inter.user.BindingAccountService;
import com.yeshi.fanli.service.inter.user.ExtractService;
import com.yeshi.fanli.service.inter.user.MoneyRecordService;
import com.yeshi.fanli.service.inter.user.PassWordErrorRecordService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
@@ -77,25 +74,16 @@
   private HongBaoService hongBaoService;
   @Resource
   private MoneyRecordService moneyRecordService;
   @Resource
   private BindingAccountService bindingAccountService;
   @Resource
   private ExtractService extractService;
   @Resource
   private PassWordErrorRecordService passWordErrorRecordService;
   @Resource
   private ConfigService configService;
   @Resource
   private SystemService systemService;
   @Resource
   private HongBaoMessageService hongBaoMessageService;
   @Resource
   private ShamUserService shamUserService;
@@ -154,8 +142,8 @@
    */
   @RequestMapping(value = "login")
   public void login(AcceptData acceptData, String code, String vcode, String phone, boolean wxinstall,
         String tbOpenid, String tbNickName, String tbPortrait, int loginType, Boolean first, HttpSession session,HttpServletRequest request,
         PrintWriter out) {
         String tbOpenid, String tbNickName, String tbPortrait, int loginType, Boolean first, HttpSession session,
         HttpServletRequest request, PrintWriter out) {
      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
      if (system == null) {
         out.print(JsonUtil.loadFalseResult("系统不存在"));
@@ -197,6 +185,11 @@
         root.put("data", data);
         out.print(JsonUtil.loadTrueResult(root));
      } catch (UserAccountException e) {
         try {
            LogHelper.cookieLog("登录出错:" + e.getCode() + "-" + e.getMessage());
         } catch (Exception e1) {
            e1.printStackTrace();
         }
         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
      }
   }
@@ -321,11 +314,35 @@
            out.print(JsonUtil.loadFalseResult(1, "获取微信用户信息失败"));
            return;
         }
         user = userAccountService.getUserInfoByWXUnionId(system.getAppid(), weiXinUser.getUnionid());
         try {
            user = userAccountService.getUserInfoByWXUnionId(system.getAppid(), weiXinUser.getUnionid());
         } catch (UserAccountException e) {
            try {
               LogHelper.errorDetailInfo(e, null, "获取用户信息出错");
            } catch (Exception e1) {
               e1.printStackTrace();
            }
         }
      } else if (!StringUtil.isNullOrEmpty(tbOpenid)) {
         user = userAccountService.getUserInfoByTaoBaoOpenId(system.getAppid(), tbOpenid);
         try {
            user = userAccountService.getUserInfoByTaoBaoOpenId(system.getAppid(), tbOpenid);
         } catch (UserAccountException e) {
            try {
               LogHelper.errorDetailInfo(e);
            } catch (Exception e1) {
               e1.printStackTrace();
            }
         }
      } else if (!StringUtil.isNullOrEmpty(phone)) {
         user = userAccountService.getUserInfoByPhone(system.getAppid(), phone);
         try {
            user = userAccountService.getUserInfoByPhone(system.getAppid(), phone);
         } catch (UserAccountException e) {
            try {
               LogHelper.errorDetailInfo(e);
            } catch (Exception e1) {
               e1.printStackTrace();
            }
         }
      }
      if (user == null) {
@@ -716,9 +733,7 @@
         redisManager.removeCommonString(key);
      }
   }
   @RequestMapping(value = "bindalipaywithverifynew")
   public void bindAlipayWithVerifyNew(AcceptData acceptData, Long uid, String name, String account, PrintWriter out) {
@@ -764,7 +779,8 @@
            "PERMIT_CHECK_PERM_IDENTITY_THEFT", "PERMIT_NON_BANK_LIMIT_PAYEE", "EXCEED_LIMIT_UNRN_DM_AMOUNT" };
      try {
         BindingAccount bindingAccount = bindingAccountService.changeAlipayBindingWithVerify(uid, name, account);
         out.print(JsonUtil.loadTrue(0, JsonUtil.getGson().toJson(bindingAccount), "系统已成功转账0.1元到提现账号中,提现账号验证通过,恭喜你!可以提现了。"));
         out.print(JsonUtil.loadTrue(0, JsonUtil.getGson().toJson(bindingAccount),
               "系统已成功转账0.1元到提现账号中,提现账号验证通过,恭喜你!可以提现了。"));
      } catch (AlipayTransferException e1) {
         if (e1.getSubCode().equalsIgnoreCase("PAYEE_NOT_EXIST")) {
            String msg = "系统未能成功转账0.1元,提现账号信息有误,请核对后重新填写。";
@@ -808,7 +824,6 @@
         redisManager.removeCommonString(key);
      }
   }
   /**
    * 获取用户资金详情