系统区分BUG修复

admin

2020-07-14 eec7e789a87863c25d92c10ad5dfc22ad80c448d

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

@@ -39,6 +39,7 @@
import com.yeshi.fanli.util.VersionUtil;

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

import com.yeshi.fanli.util.annotation.RequestSerializableByKey;

import com.yeshi.fanli.vo.homemodule.BannerVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -104,8 +105,8 @@
         data.put("moneyLastMonth", "---");

      } else {

         // 我的队员

         long myFirstTeamCount = threeSaleSerivce.getFirstUsersCount(Long.parseLong(uid));

         long mySecondTeamCount = threeSaleSerivce.getSecondUsersCount(Long.parseLong(uid));

         long myFirstTeamCount = threeSaleSerivce.countFirstTeam(Long.parseLong(uid));

         long mySecondTeamCount = threeSaleSerivce.countSecondTeam(Long.parseLong(uid));

         long myTeamCount = myFirstTeamCount + mySecondTeamCount;

         data.put("myTeam", myTeamCount);

         // 1.5.0后已经不使用此字段

@@ -128,10 +129,10 @@
      data.put("activityRules", valueBr);

      data.put("inviteList", String.format("http://%s/%s/client/share/friends_new.html",

            Constant.systemCommonConfig.getProjectHost(), Constant.systemCommonConfig.getProjectName()));

      List<SwiperPicture> pictureList = swiperPictureService.getByBannerCardAndVersion("invite_top_banner",

            acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));

      List<BannerVO> pictureList = swiperPictureService.getByBannerCardAndVersion("invite_top_banner",

            acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());

      if (pictureList != null && pictureList.size() > 0) {

         SwiperPicture picture = pictureList.get(0);

         BannerVO picture = pictureList.get(0);

         com.alibaba.fastjson.JSONObject pictureJson = new com.alibaba.fastjson.JSONObject();

         pictureJson.put("src", picture.getSrc());

         pictureJson.put("jumpDetail", picture.getJumpDetail());

@@ -139,7 +140,7 @@
         data.put("topBanner", pictureJson);

      }



      data.put("desc", configService.get(ConfigKeyEnum.inviteDesc.getKey()));

      data.put("desc", configService.getValue(ConfigKeyEnum.inviteDesc.getKey(),acceptData.getSystem()));



      boolean hasCode = false;

      if (uid != null && uid.trim().length() > 0) {

@@ -151,7 +152,7 @@


      // 邀请激活链接

      if (!hasCode) {

         data.put("activationlink", configService.get(ConfigKeyEnum.inviteActivationUrl.getKey()));

         data.put("activationlink", configService.getValue(ConfigKeyEnum.inviteActivationUrl.getKey(),acceptData.getSystem()));

      }



      data.put("hasCode", hasCode);

@@ -167,7 +168,6 @@
    * 方法说明: 分享好友邀请图片

    * 

    * @author mawurui createTime 2018年4月3日 下午3:49:05

    * @param pageIndex

    * @param out

    * @param uid

    * @throws NotExistObjectException

@@ -206,7 +206,7 @@
      String valueN = values.getValue();

      String valueBr = valueN.replace("\n", "<br><br>");



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

      data.put("helpLink", configService.getValue(ConfigKeyEnum.inviteHelpLink.getKey(),acceptData.getSystem()));



      data.put("inviteRules", valueBr);

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

@@ -221,7 +221,7 @@
   @RequestMapping(value = "getActivationTip")

   public void getActivationTip(AcceptData acceptData, String callback, PrintWriter out) {

      try {

         String tip = configService.get(ConfigKeyEnum.inviteActivationTip.getKey());

         String tip = configService.getValue(ConfigKeyEnum.inviteActivationTip.getKey(),acceptData.getSystem());

         if (tip == null || tip.trim().length() == 0) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无提醒"));

            return;

@@ -282,10 +282,8 @@
   /**

    * 激活邀请

    * 

    * @param callback

    * @param uid

    *            用户id

    * @param inviteCode

    *            邀请嘛

    * @param out

    */

@@ -333,7 +331,7 @@
            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("邀请码不存在"));

            return;

         }

         String tip = configService.get(ConfigKeyEnum.inviteActivationSuccessTip.getKey());

         String tip = configService.getValue(ConfigKeyEnum.inviteActivationSuccessTip.getKey(),acceptData.getSystem());



         JSONObject data = new JSONObject();

         data.put("inviteCode", inviteCode);