粉丝信息统计

yujian

2020-05-14 e33f868ce527b080b470ec89bee0f33e25dea960

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

@@ -477,7 +477,7 @@
         object.put("level", level.name());

         object.put("validFans", validFans);



         if (wxtip && type == 1 && threeSale.getState() != null && threeSale.getState()) {

         if (wxtip) {

            // 一级队员 查询昵称备注

            String memoName = null;

            ThreeSaleExtraInfo threeSaleExtraInfo = threeSale.getThreeSaleExtraInfo();

@@ -488,7 +488,7 @@
            }

            object.put("memoName", memoName);



            if (!VersionUtil.greaterThan_2_1_1(acceptData.getPlatform(), acceptData.getVersion())) {

            if (type == 1 && !VersionUtil.greaterThan_2_1_1(acceptData.getPlatform(), acceptData.getVersion())) {

               // 添加微信信息

               if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin())) {

                  object.put("weiXin", userInfoExtra.getWeiXin());

@@ -904,7 +904,8 @@
      if (focus.getStateValid() != null || focus.getTaobaoBind() != null || focus.getWeixinBind() != null

            || focus.getMinFansNum() != null || focus.getMinFansNum() != null

            || focus.getMinActiveTime() != null || focus.getMaxActiveTime() != null

            || focus.getMinIncome() != null  || focus.getMaxIncome() != null || !StringUtil.isNullOrEmpty(focus.getKey()))

            || focus.getMinIncome() != null  || focus.getMaxIncome() != null 
            || !StringUtil.isNullOrEmpty(focus.getKey()) || !StringUtil.isNullOrEmpty(focus.getLevel()))

          return true;

   

      return false;

@@ -1105,7 +1106,6 @@


      // 上级

      UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());

		 
      

      JSONArray tagArray = new JSONArray();

      String memoName = user.getNickName();

@@ -1199,11 +1199,12 @@
      if (directNum > 0) {

         indirectNum = threeSaleSerivce.countSecondTeam(workerId);

      }

		
      // 订单统计

      long countTB = commonOrderCountService.countOrderBySourceAndNearDay(workerId, Constant.SOURCE_TYPE_TAOBAO, 60);

      long countJD = commonOrderCountService.countOrderBySourceAndNearDay(workerId, Constant.SOURCE_TYPE_JD, 60);

      long countPDD = commonOrderCountService.countOrderBySourceAndNearDay(workerId, Constant.SOURCE_TYPE_PDD, 60);



		
      data.put("fansNum", "直接粉丝： "+directNum+"人\n" + "间接粉丝： "+indirectNum+"人");

      data.put("orderInfo", "淘宝 ("+countTB+"笔)\n" + "京东 ("+countJD+"笔)\n" + "拼多多 ("+countPDD+"笔)");

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

@@ -1226,7 +1227,7 @@


      int type = 1;

      ThreeSale threeSale = threeSaleSerivce.getByWorkerId(workerId);

      if (threeSale == null) {

      if (threeSale != null && threeSale.getBoss().getId() != uid) {

         type = 2;

      }