admin
2019-08-16 b90c2f738f64df608ae9f9277c7a3ab35c46498a
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
@@ -122,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));
   }
   
@@ -272,6 +284,7 @@
         tipWeiXin.add("你也可以向邀请人学习或向一级队员教授赚钱技巧。");
      }
      resultData.put("tipWeiXin", tipWeiXin);
      resultData.put("tipWeiXinAdd", "添加微信号后,你的邀请人和一级队员可以通过微信与你建立联系。");
      resultData.put("bdWeiXin", bdWeiXin);
      
      out.print(JsonUtil.loadTrueResult(resultData));
@@ -311,7 +324,6 @@
            }
         }
         bossData.put("inviteTime", "你于 " + sdf.format(inviteTime) + "接受了TA的邀请");
      } else {
         bossData.put("hasBoss", false);
         bossData.put("helpLink", configService.get("invite_code_hlep_link"));
@@ -355,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);