通用模板修改

admin

2019-08-19 e5e38de6745c8fcae91fa7e459898f3663d00001

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

@@ -29,7 +29,6 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.VersionUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -71,6 +70,7 @@
         JSONObject data = new JSONObject();

         data.put("nickName", userInfo.getNickName());

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

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

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

      } catch (UserInfoExtraException e) {

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

@@ -89,6 +89,7 @@
         JSONObject data = new JSONObject();

         data.put("nickName", userInfo.getNickName());

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

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

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

      } catch (UserInfoExtraException e) {

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

@@ -121,6 +122,18 @@
      

      // 组织数据

      JSONObject resultData = organizeTeam(count, listTeam, uid, type);

		
      // 第一页判断是否激活 是否有队员

      if (type == 1 && page == 1) {

         boolean hasCode = false;

         UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

         if (userInfoExtra != null) {

            if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode()))

               hasCode = true;

         }

         resultData.put("hasCode", hasCode);

         resultData.put("hasTeam", count > 0? true:false);

      }

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

   }

   

@@ -227,12 +240,21 @@
   public void countMyTeam(AcceptData acceptData, long uid, PrintWriter out) {

      JSONObject bossData = getBossInfo(acceptData, uid, threeSaleSerivce.getMyBoss(uid));

      JSONObject resultData = new JSONObject();

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

      resultData.put("boss", bossData);

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

      resultData.put("firstTeam", threeSaleSerivce.countFirstTeam(uid, 1));

      resultData.put("firstTeam", firstTeam);

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

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

      resultData.put("secondTeamTotal", threeSaleSerivce.countSecondTeam(uid, null));

		
      boolean hasTeam = true;

      if (firstTeam <= 0) {

         hasTeam = false;

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

      }

      resultData.put("hasTeam", hasTeam);

      

      boolean hasCode = false;

      boolean bdWeiXin = false;

@@ -245,15 +267,15 @@
            bdWeiXin = true;

      }

      

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

      // 未激活邀请码

      resultData.put("hasCode", hasCode);

      if (!hasCode) {

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

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

         tipCode.add("激活邀请功能后才可以邀请队员，一级队员是由你直接邀请，二级队员是由你的一级队员邀请。");

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

         resultData.put("tipCode", tipCode);

      }

      resultData.put("hasCode", hasCode);

      resultData.put("tipCode", tipCode);

      

      // 未添加微信号

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

@@ -262,6 +284,7 @@
         tipWeiXin.add("你也可以向邀请人学习或向一级队员教授赚钱技巧。");

      }

      resultData.put("tipWeiXin", tipWeiXin);

      resultData.put("tipWeiXinAdd", "添加微信号后，你的邀请人和一级队员可以通过微信与你建立联系。");

      resultData.put("bdWeiXin", bdWeiXin);

      

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

@@ -301,7 +324,6 @@
            }

         }

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

			
      } else {

         bossData.put("hasBoss", false);

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

@@ -345,12 +367,13 @@
      }

      

      try {

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

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

         pushService.pushZNX(remindId, "", "", listIOS, listAndroid);



         userSystemMsgService.addUserSystemMsg(remindId, UserSystemMsgTypeEnum.question,

               "", "", UserSystemMsg.TIME_TAG_EMERGENT, null);

         // TODO版本区分

			
//         List<String> listIOS = new ArrayList<String>();

//         List<String> listAndroid = new ArrayList<String>();

//         pushService.pushZNX(remindId, "", "", listIOS, listAndroid);

//         userSystemMsgService.addUserSystemMsg(remindId, UserSystemMsgTypeEnum.question,

//               "", "", UserSystemMsg.TIME_TAG_EMERGENT, null);

         

         JSONObject data = new JSONObject();

         data.put("weiXinState", 2);