2.0.7相关服务端功能添加

admin

2020-02-23 b59fef5c00b15fdfdfa9d4be26e5bf6b41c75458

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java

@@ -27,6 +27,7 @@
import com.yeshi.fanli.entity.bus.user.UserInviteSeparate;

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

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

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

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

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

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

@@ -44,6 +45,7 @@
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisKeyEnum;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.VersionUtil;

@@ -135,8 +137,8 @@
         if (wxUnionId == null || wxUnionId.trim().length() == 0)

            throw new UserInfoExtraException(1, "微信授权失败");



         String activeWX = StringUtil.Md5("activeWX:" + weiXinUser.getUnionid());

         redisManager.cacheCommonString(activeWX, JsonUtil.getSimpleGson().toJson(weiXinUser), 60 * 20);

         String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, StringUtil.Md5("activeWX:" + weiXinUser.getUnionid()));

         redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(weiXinUser), 60 * 20);



         // 邀请关系用户信息

         UserInfo userInfo = userInfoExtraService.getInviterInfo(uid, wxUnionId);

@@ -145,7 +147,7 @@
         data.put("nickName", userInfo.getNickName());

         data.put("portrait", userInfo.getPortrait());

         data.put("tips", "确认要成为TA的直接粉丝吗？邀请关系一旦建立不可更改。");

         data.put("key", activeWX);

         data.put("key", key);

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

      } catch (UserInfoExtraException e) {

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

@@ -375,7 +377,7 @@


      long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);

      resultData.put("boss", bossData);

      resultData.put("helpLink", configService.get("team_help_url"));

      resultData.put("helpLink", configService.get(ConfigKeyEnum.teamHelpUrl.getKey()));

      resultData.put("firstTeam", firstTeam);

      resultData.put("firstTeamTotal", threeSaleSerivce.countFirstTeam(uid, null));

      resultData.put("secondTeam", threeSaleSerivce.countSecondTeam(uid, 1));

@@ -384,7 +386,7 @@
      boolean hasTeam = true;

      if (firstTeam <= 0) {

         hasTeam = false;

         resultData.put("invitelink", configService.get("invite_activation_url"));

         resultData.put("invitelink", configService.get(ConfigKeyEnum.inviteActivationUrl.getKey()));

      }

      resultData.put("hasTeam", hasTeam);



@@ -403,7 +405,7 @@
      resultData.put("hasCode", hasCode);

      if (!hasCode) {

         List<String> tipCode = new ArrayList<String>();

         resultData.put("helpLinkActivate", configService.get("team_help_url"));

         resultData.put("helpLinkActivate", configService.get(ConfigKeyEnum.teamHelpUrl.getKey()));

         tipCode.add("激活邀请功能后才可以邀请粉丝，直接粉丝是由你直接邀请，间接粉丝是由你的直接粉丝邀请。");

         tipCode.add("邀请激活功能，必须要有邀请码，邀请码可以通过金币兑换，也可以全网搜索。");

         resultData.put("tipCode", tipCode);

@@ -476,7 +478,7 @@
         bossData.put("inviteTime", "你于 " + sdf.format(inviteTime) + "接受了TA的邀请");

      } else {

         bossData.put("hasBoss", false);

         bossData.put("helpLink", configService.get("invite_code_hlep_link"));

         bossData.put("helpLink", configService.get(ConfigKeyEnum.inviteCodeHlepLink.getKey()));

         bossData.put("weiXinTip", "恭喜你，我们的优质用户；\r\n你并没有邀请人，但你的邀请激活功能是被默认开启的；\r\n你拥有独特的无邀请人激活码。");

      }

      return bossData;

@@ -615,10 +617,10 @@
         JSONObject data = new JSONObject();

         data.put("count", spreadImgService.countAll());

         data.put("inviteCode", inviteCode);

         data.put("helpLink", configService.get("invite_help_link"));

         data.put("helpLink", configService.get(ConfigKeyEnum.inviteHelpLink.getKey()));

         data.put("inviteRules",  values.getValue().replace("\n", "<br><br>"));

         data.put("imgUrlList", JsonUtil.getSimpleGsonWithDate().toJson(imgList));

         data.put("inviteLink", "http://a.app.qq.com/o/simple.jsp?pkgname=com.yeshi.ec.rebate");

         data.put("inviteLink", Constant.YINGYONGBAO_LINK);

         out.print(JsonUtil.loadTrue(0, JsonUtil.getSimpleGson().toJson(data), "成功"));

      } catch (Exception e) {

         LogHelper.errorDetailInfo(e);