多APP优化

admin

2020-07-03 651a15c78f668bef3859d9ed1bb7ad0b669d3600

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

@@ -7,6 +7,7 @@
import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpSession;



import com.yeshi.fanli.util.*;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

@@ -14,6 +15,8 @@
import org.yeshi.utils.encrypt.DESUtil;



import com.alipay.api.AlipayApiException;

import com.google.gson.Gson;

import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;

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

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

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

@@ -21,29 +24,36 @@
import com.yeshi.fanli.entity.bus.user.LoginResult;

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

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

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

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

import com.yeshi.fanli.entity.push.DeviceActive;

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

import com.yeshi.fanli.entity.taobao.ClientTBPid;

import com.yeshi.fanli.entity.taobao.PidUser;

import com.yeshi.fanli.entity.taobao.TBPid;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.exception.AlipayAccountException;

import com.yeshi.fanli.exception.AlipayTransferException;

import com.yeshi.fanli.exception.UserAccountException;

import com.yeshi.fanli.exception.user.AlipayAccountException;

import com.yeshi.fanli.exception.user.AlipayTransferException;

import com.yeshi.fanli.exception.user.UserAccountException;

import com.yeshi.fanli.exception.user.UserInfoException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.homemodule.HomeNavbarUserService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

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

import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;

import com.yeshi.fanli.service.inter.money.extract.ExtractService;

import com.yeshi.fanli.service.inter.order.HongBaoV2Service;

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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.push.DeviceTokenXMService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

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

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

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

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

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

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

@@ -51,20 +61,16 @@
import com.yeshi.fanli.service.inter.user.UserAccountBindingHistoryService;

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

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

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

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.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.wx.WXLoginUtil;



import net.sf.json.JSONObject;

import org.yeshi.utils.entity.ProxyIP;



/**

 * 账户系统

@@ -122,6 +128,15 @@
   private DeviceTokenHWService deviceTokenHWService;



   @Resource

   private DeviceTokenOPPOService deviceTokenOPPOService;



   @Resource

   private DeviceTokenXMService deviceTokenXMService;



   @Resource

   private DeviceTokenVIVOService deviceTokenVIVOService;



   @Resource

   private TaoBaoUnionConfigService taoBaoUnionConfigService;



   @Resource

@@ -141,20 +156,21 @@


   @Resource

   private UserAccountBindingHistoryService userAccountBindingHistoryService;

	


   @Resource

   private HomeNavbarUserService homeNavbarUserService;

	


   @Resource

   private UserInfoDeleteRecordService userInfoDeleteRecordService;

	


   @Resource

   private UserTaoLiJinOriginService userTaoLiJinOriginService;

	


   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

   private static final String EXTRACT_MAX_MONEY = "extract_max_money";

   @Resource

   private UserInfoModifyRecordService userInfoModifyRecordService;



   @Resource

   private DeviceActiveService deviceActiveService;



   /**

    * 

@@ -173,6 +189,13 @@
   public void login(AcceptData acceptData, String code, String vcode, String phone, boolean wxinstall,

         String tbOpenid, String tbNickName, String tbPortrait, String tbSession, int loginType, Boolean first,

         HttpSession session, HttpServletRequest request, PrintWriter out) {



      // 2.0以下版本不允许登录

      if (!VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion())) {

         out.print("请升级到最新版本");

         return;

      }



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

            acceptData.getPackages());

      if (system == null) {

@@ -217,8 +240,8 @@
      tbUserInfo.setTbPic(tbPortrait);



      try {

         LoginResult result = userAccountService.login(request, first, system.getAppid(), code, phone, tbUserInfo,

               wxinstall, loginType);

         LoginResult result = userAccountService.login(request, acceptData, first, system.getAppid(), code, phone,

               tbUserInfo, wxinstall, loginType);

         if (result == null)

            LogHelper.error("login-result为空值");



@@ -240,14 +263,13 @@
         ThreadUtil.run(new Runnable() {

            public void run() {

               try {

                  int platformType = 0;

                  String platform = acceptData.getPlatform();

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

                     platformType = 1;

                  } else if ("ios".equals(platform)) {

                     platformType = 2;

                  // 绑定oppo,vivo推送

                  DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());

                  if (active != null) {

                     deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());

                     deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());

                     deviceTokenXMService.bindUid(active.getId(), uuser.getId());

                  }

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

               } catch (Exception e) {

                  e.printStackTrace();

               }

@@ -256,7 +278,7 @@


      } catch (UserAccountException e) {

         try {

            LogHelper.cookieLog("登录出错:" + e.getCode() + "-" + e.getMessage());

            LogHelper.error("登录出错:" + e.getCode() + "-" + e.getMessage());

         } catch (Exception e1) {

            e1.printStackTrace();

         }

@@ -280,6 +302,12 @@
   @RequestMapping(value = "register")

   public void register(AcceptData acceptData, String tbOpenid, String tbNickName, String tbPortrait, String vcode,

         String phone, HttpServletRequest request, HttpSession session, PrintWriter out) {

      // 2.0以下版本不允许登录

      if (!VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion())) {

         out.print("请升级到最新版本");

         return;

      }



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

            acceptData.getPackages());

      if (system == null) {

@@ -331,40 +359,6 @@
   }



   /**

    * 账号打通

    * 
    * @param acceptData

    * @param mainUid

    * @param lessUid

    * @param session

    * @param out

    */

   @RequestMapping(value = "connect")

   public void connect(AcceptData acceptData, long mainUid, long lessUid, HttpSession session, PrintWriter out) {

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

            acceptData.getPackages());

      if (system == null) {

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

         return;

      }



      if (mainUid == 0 || lessUid == 0) {

         out.print(JsonUtil.loadFalseResult(1, "请上传打通用户ID"));

         return;

      }



      try {

         userAccountService.connectUsers(new UserInfo(mainUid), new UserInfo(lessUid));

         UserInfo user = userInfoService.getUserByIdWithMybatis(mainUid);

         JSONObject data = new JSONObject();

         data.put("user", GsonUtil.toJsonExpose(UserUtil.filterForClientUser(user)));

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

      } catch (UserAccountException e) {

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

      }

   }



   /**

    * 获取用户ID

    * 

    * @param acceptData

@@ -383,13 +377,16 @@
      }

      UserInfo user = null;

      if (!StringUtil.isNullOrEmpty(code)) {

         WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code);

         WXAccountInfoDTO accountInfo = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());



         WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, accountInfo.getAppId(),

               accountInfo.getAppSecret());

         if (weiXinUser == null) {

            out.print(JsonUtil.loadFalseResult(1, "获取微信用户信息失败"));

            return;

         }

         try {

            user = userAccountService.getUserInfoByWXUnionId(system.getAppid(), weiXinUser.getUnionid());

            user = userAccountService.getUserInfoByWXUnionId(SystemInfoUtil.getSystem(acceptData), weiXinUser.getUnionid());

         } catch (UserAccountException e) {

            try {

               LogHelper.errorDetailInfo(e, null, "获取用户信息出错");

@@ -399,7 +396,7 @@
         }

      } else if (!StringUtil.isNullOrEmpty(tbOpenid)) {

         try {

            user = userAccountService.getUserInfoByTaoBaoOpenId(system.getAppid(), tbOpenid);

            user = userAccountService.getUserInfoByTaoBaoOpenId(SystemInfoUtil.getSystem(acceptData), tbOpenid);

         } catch (UserAccountException e) {

            try {

               LogHelper.errorDetailInfo(e);

@@ -409,7 +406,7 @@
         }

      } else if (!StringUtil.isNullOrEmpty(phone)) {

         try {

            user = userAccountService.getUserInfoByPhone(system.getAppid(), phone);

            user = userAccountService.getUserInfoByPhone(SystemInfoUtil.getSystem(acceptData), phone);

         } catch (UserAccountException e) {

            try {

               LogHelper.errorDetailInfo(e);

@@ -636,7 +633,7 @@
      }



      try {

         userAccountService.changeWXBind(uid, code);

         userAccountService.changeWXBind(acceptData, uid, code);

         UserInfo user = userInfoService.getUserByIdWithMybatis(uid);

         // 判断taoBaoUid是否已经封禁

         ForbiddenUserIdentifyCode ic = forbiddenUserIdentifyCodeService

@@ -765,8 +762,7 @@
         return;

      }



      String key = "bindalipay-" + uid;



      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.bindAlipay, uid + "");

      if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {

         out.print(JsonUtil.loadFalseResult(2, "服务器繁忙，请稍后重试"));

         return;

@@ -821,8 +817,7 @@
         return;

      }



      String key = "bindalipay-" + uid;



      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.bindAlipay, uid + "");

      if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {

         out.print(JsonUtil.loadFalseResult(1001, "服务器繁忙，请稍后重试"));

         return;

@@ -912,15 +907,12 @@
         return;

      }



      String key = "bindalipay-" + uid;



      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.bindAlipay, uid + "");

      if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {

         out.print(JsonUtil.loadFalseResult(1001, "服务器繁忙，请稍后重试"));

         return;

      }

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



		


      // 支付宝绑定

      ForbiddenUserIdentifyCode ic = forbiddenUserIdentifyCodeService

@@ -939,11 +931,22 @@
      String[] ALIPAY_CODES = new String[] { "SYSTEM_ERROR", "PERMIT_CHECK_PERM_LIMITED", "PERM_AML_NOT_REALNAME_REV",

            "PERM_AML_NOT_REALNAME_REV", "PAYEE_USER_INFO_ERROR", "PAYEE_ACC_OCUPIED",

            "PERMIT_CHECK_PERM_IDENTITY_THEFT", "PERMIT_NON_BANK_LIMIT_PAYEE", "EXCEED_LIMIT_UNRN_DM_AMOUNT" };

      BindingAccount oldBindingAccount = bindingAccountService.getBindingAccountByUidAndType(uid,

            BindingAccount.TYPE_ALIPAY);

      try {

         BigDecimal balance = user.getMyHongBao();

         BindingAccount bindingAccount = bindingAccountService.changeAlipayBindingWithVerify(uid, name, account);

         out.print(JsonUtil.loadTrue(0, JsonUtil.getGson().toJson(bindingAccount),

               "系统已成功转账0.1元到提现账号中，提现账号验证通过，恭喜你！可以提现了。"));

         // 余额充足

         if (balance.compareTo(new BigDecimal("0.1")) >= 0)

            out.print(JsonUtil.loadTrue(0, JsonUtil.getGson().toJson(bindingAccount),

                  "系统已成功转账0.1元到提现账号中，提现账号验证通过，恭喜你！可以提现了。"));

         else

            out.print(JsonUtil.loadTrue(0, JsonUtil.getGson().toJson(bindingAccount),

                  "系统已成功转账0.1元到提现账号中，提现账号验证通过，恭喜你！可以提现了。注：此0.1元将会在后续产生的余额中合理扣除，敬请知晓。"));



         userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindAlipay, account);

      } catch (AlipayTransferException e1) {

         LogHelper.error("支付宝验证出错:"+new Gson().toJson(e1));

         if (e1.getSubCode().equalsIgnoreCase("PAYEE_NOT_EXIST")) {

            String msg = "系统未能成功转账0.1元，提现账号信息有误，请核对后重新填写。";

            out.print(JsonUtil.loadFalseResult(1, msg));

@@ -964,7 +967,11 @@
      } catch (AlipayAccountException e3) {

         // 账户无余额

         if (e3.getCode() == AlipayAccountException.CODE_NO_MONEY) {

            out.print(JsonUtil.loadFalseResult(5, "你的账户目前没有余额，无需绑定提现账号。"));

            if (oldBindingAccount != null) {

               out.print(JsonUtil.loadFalseResult(5, "当前账户没有余额，无需修改，请有余额后修改"));

            } else {

               out.print(JsonUtil.loadFalseResult(5, "当前账户没有余额，请有余额后绑定"));

            }

            return;

            // 提现次数限制

         } else if (e3.getCode() == AlipayAccountException.CODE_TIMES_LIMIT) {

@@ -1031,7 +1038,7 @@
         data.put("totalUnGetTiChengMoney",

               hongBaoV2Service.getUnGetTiChengMoney(uid).setScale(2, BigDecimal.ROUND_DOWN).toString()); // 未到账提成

         // 展示提成数据

         if (configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))

         if (configService.iosOnLining(Integer.parseInt(acceptData.getVersion()),SystemInfoUtil.getSystem(acceptData)))

            data.put("showTiCheng", false);

         else

            data.put("showTiCheng", spreadImgCount + shareCount > 0);

@@ -1108,9 +1115,19 @@
   public void logOut(AcceptData acceptData, Long uid, PrintWriter out) {

      if (uid == null || uid == 0)

         return;

      // 需要解绑HW推送的用户绑定

      if ("android".equalsIgnoreCase(acceptData.getPlatform()))

      if ("android".equalsIgnoreCase(acceptData.getPlatform())) {

         DeviceActive deviceActive = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());

         // 需要解绑HW推送的用户绑定

         deviceTokenHWService.unBindDeviceToken(acceptData.getDevice());

         if (deviceActive != null) {

            // 解绑OPPO推送的用户绑定

            deviceTokenOPPOService.unBindUid(uid, deviceActive.getId());

            // 解绑VIVO推送的用户绑定

            deviceTokenVIVOService.unBindUid(uid, deviceActive.getId());

            // 解绑XM推送的用户绑定

            deviceTokenXMService.unBindUid(deviceActive.getId());

         }

      }

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

   }



@@ -1130,6 +1147,12 @@
   public void loginNew(AcceptData acceptData, String vcode, String phone, String code, int loginType,

         HttpServletRequest request, PrintWriter out) {



      // 2.0以下版本不允许登录

      if (!VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion())) {

         out.print("请升级到最新版本");

         return;

      }



      try {

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

               acceptData.getPackages());

@@ -1141,12 +1164,12 @@
         UserInfo userInfo = null;

         // 手机登录

         if (loginType == 1) {

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

            userInfo = userAccountService.loginPhone(new ProxyIP(request.getRemoteHost(),request.getRemotePort()), acceptData, loginType, vcode, phone, system.getAppid());

         }



         // 微信登录

         if (loginType == 2) {

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

            userInfo = userAccountService.loginWinXin(new ProxyIP(request.getRemoteHost(),request.getRemotePort()), acceptData, loginType, code, system.getAppid());

         }



         if (userInfo == null) {

@@ -1166,29 +1189,14 @@
                  } catch (Exception e) {

                     LogHelper.errorDetailInfo(e);

                  }

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

                  try {

                     int platformType = 0;

                     String platform = acceptData.getPlatform();

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

                        platformType = 1;

                     } else if ("ios".equals(platform)) {

                        platformType = 2;

                     }

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

                  } catch (Exception e) {

                     e.printStackTrace();



                  // 绑定oppo推送

                  DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());

                  if (active != null) {

                     deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());

                     deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());

                     deviceTokenXMService.bindUid(active.getId(), uuser.getId());

                  }

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

                     /* 新人红包 */

                     try {

                        userTaoLiJinOriginService.synchDeviceHongbao(uuser.getId(),  device);

                     } catch (Exception e) {

                        e.printStackTrace();

                     }

                  } 
               }

            });

         }

@@ -1196,7 +1204,7 @@
      } catch (UserAccountException e) {

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

         try {

            LogHelper.cookieLog("登录出错:" + e.getCode() + "-" + e.getMessage());

            LogHelper.error("登录出错:" + e.getCode() + "-" + e.getMessage());

         } catch (Exception e1) {

            e1.printStackTrace();

         }

@@ -1302,7 +1310,7 @@
      }



      try {

         userAccountService.bindWeiXin(uid, code);

         userAccountService.bindWeiXin(acceptData, uid, code);



         UserInfo user = userInfoService.getUserByIdWithMybatis(uid);

         // 判断taoBaoUid是否已经封禁

@@ -1325,5 +1333,5 @@
         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

      }

   }



	
}