热销转换发圈

Administrator

2020-02-24 09417e97672be66c5e312b10f23a9e30da3acb97

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

@@ -47,6 +47,8 @@
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.ForbiddenUserIdentifyCodeService;

@@ -63,10 +65,10 @@
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.RedisKeyEnum;

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.wx.WXLoginUtil;



@@ -131,6 +133,12 @@
   private DeviceTokenOPPOService deviceTokenOPPOService;



   @Resource

   private DeviceTokenXMService deviceTokenXMService;



   @Resource

   private DeviceTokenVIVOService deviceTokenVIVOService;



   @Resource

   private TaoBaoUnionConfigService taoBaoUnionConfigService;



   @Resource

@@ -166,9 +174,6 @@
   @Resource

   private DeviceActiveService deviceActiveService;



   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";



   /**

    * 

@@ -262,6 +267,13 @@
                     platformType = 2;

                  }

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

                  // 绑定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());

                  }

               } catch (Exception e) {

                  e.printStackTrace();

               }

@@ -270,7 +282,7 @@


      } catch (UserAccountException e) {

         try {

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

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

         } catch (Exception e1) {

            e1.printStackTrace();

         }

@@ -344,39 +356,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

@@ -782,8 +761,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;

@@ -838,8 +816,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;

@@ -929,8 +906,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;

@@ -1144,6 +1120,10 @@
         if (deviceActive != null) {

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

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

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

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

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

            deviceTokenXMService.unBindUid(deviceActive.getId());

         }

      }

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

@@ -1216,13 +1196,12 @@
                     e.printStackTrace();

                  }



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

                     /* 新人红包 */

                     try {

                        userTaoLiJinOriginService.synchDeviceHongbao(uuser.getId(), 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());

                  }

               }

            });

@@ -1231,7 +1210,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();

         }