yujian
2019-08-12 c78568393d08775e0f81e453545440923c56af6d
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
@@ -147,7 +147,6 @@
      }
      resultData.put("bdWeiXin", bdWeiXin);
      
      // 安卓返回统计数据
      String platform = acceptData.getPlatform();
      if ("android".equalsIgnoreCase(platform)) {
@@ -290,30 +289,26 @@
         Long createTime = threeSale.getCreateTime();
         Date inviteTime = new Date(createTime);
         
         if(VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
            UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(boss.getId());
            if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin())) {
               bossData.put("weiXin", userInfoExtra.getWeiXin());
               bossData.put("weiXinState", 3);
               bossData.put("weiXinTip", "添加TA的微信,你可向TA学习如何通过板栗快省赚钱。");
            } else {
               if (!threeSaleExtraInfoSerivce.isRemindBoss(boss.getId(), uid)) {
                  bossData.put("weiXinState", 1);
                  bossData.put("weiXinTip", "点击提醒TA,系统会发送一封站内信,提醒其添加微信号。");
               } else {
                  bossData.put("weiXinState", 2);
                  bossData.put("weiXinTip", "系统已发送提醒,邀请人添加微信后你可复制,如对方迟迟不添加,你可联系人工客服寻求帮助");
               }
            }
            bossData.put("inviteTime", "你于 " + sdf.format(inviteTime) + "接受了TA的邀请");
         UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(boss.getId());
         if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin())) {
            bossData.put("weiXin", userInfoExtra.getWeiXin());
            bossData.put("weiXinState", 3);
            bossData.put("weiXinTip", "添加TA的微信,你可向TA学习如何通过板栗快省赚钱。");
         } else {
            bossData.put("inviteTime", "邀请时间: " + sdf.format(inviteTime));
            if (!threeSaleExtraInfoSerivce.isRemindBoss(boss.getId(), uid)) {
               bossData.put("weiXinState", 1);
               bossData.put("weiXinTip", "点击提醒TA,系统会发送一封站内信,提醒其添加微信号。");
            } else {
               bossData.put("weiXinState", 2);
               bossData.put("weiXinTip", "系统已发送提醒,邀请人添加微信后你可复制,如对方迟迟不添加,你可联系人工客服寻求帮助");
            }
         }
      } else if(VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())){
         bossData.put("inviteTime", "你于 " + sdf.format(inviteTime) + "接受了TA的邀请");
      } else {
         bossData.put("hasBoss", false);
         bossData.put("helpLink", configService.get("invite_code_hlep_link"));
         bossData.put("bossTip", "恭喜你,我们的优质用户;\r\n你并没有邀请人,但你的邀请激活功能是被默认开启的;\r\n你拥有独特的无邀请人激活码。");
         bossData.put("weiXinTip", "恭喜你,我们的优质用户;\r\n你并没有邀请人,但你的邀请激活功能是被默认开启的;\r\n你拥有独特的无邀请人激活码。");
      }
      return bossData;
   }