admin
2019-12-28 64a8f7a3be0a5584fe2164a2474b189c79cfab5c
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
@@ -2127,7 +2127,7 @@
         }
         data.put("moduleState", mySettings);
         int tailor = 0;
         boolean tailor = false;
         int welfareCenterNews = 0;
         String invitCode = null;
         UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
@@ -2137,10 +2137,9 @@
            }
            // vip邀请码优先
            if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCodeVip())) {
               tailor = 1;
               invitCode = userInfoExtra.getInviteCodeVip();
            } else if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
               tailor = 2;
               tailor = true;
               invitCode = userInfoExtra.getInviteCode();
            }
            
@@ -2163,15 +2162,22 @@
                  userInfo.setWeiXin(userInfoExtra.getWeiXin());
            }
            
            data.put("erCode", userInfoExtra.getErCode());
            // 二维码
            userInfo.setErCode(userInfoExtra.getErCode());
         }
         // 显示邀请码特制入口
         data.put("tailor", tailor);
         // 1.6.5 之后返回 微信号提示
         if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
            userInfo.setWeiXinTip("添加微信号后,你的邀请人和直接粉丝可以通过微信与你建立联系。");
         // 查询是否为VIP
         if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
         if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
            userInfo.setVip(userVIPInfoService.isVIP(uid));
            boolean verifyForbid = redPackForbidService.verifyForbid(uid);
            data.put("redPackLock", verifyForbid);
         }
         data.put("user", JsonUtil.getConvertBigDecimalToStringBuilder(gsonBuilder).create().toJson(userInfo));
@@ -2190,13 +2196,7 @@
               bindPhone = bindRemindService.bindRemind(uid, BindRemind.TYPE_PHONE);
            data.put("bindPhone", bindPhone);
         }
         // 2.0.2 版本
         if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
            boolean verifyForbid = redPackForbidService.verifyForbid(uid);
            data.put("redPackLock", verifyForbid);
         }
         if  (!StringUtil.isNullOrEmpty(invitCode)) {
            // 2.0.6 返回邀请人
            if (VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {
@@ -2206,15 +2206,6 @@
                  bossName = threeSale.getBoss().getNickName();
               }
               data.put("bossName", bossName);
               if(tailor == 2) {
                  long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
                  if (firstTeam >= 2) {
                     data.put("tailor", true);
                  }
               } else {
                  data.put("tailor", false);
               }
            }
         }
         
@@ -2331,7 +2322,7 @@
    */
   @RequestMapping(value = "saveInfo")
   public void saveInfo(AcceptData acceptData, String nickName, String weiXin, Integer sex, Long uid,
         String inviteCode, MultipartFile qrCodeFile, PrintWriter out) {
         String inviteCode, MultipartFile qrCodeFile, HttpServletRequest request, PrintWriter out) {
      try {
         if (uid == null) {
            out.print(JsonUtil.loadFalseResult("用户未登录"));