有效粉丝统计bug

yj

2020-03-13 9a38f81e7e7c817aa539416a41d33856209c7fe1

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

@@ -25,6 +25,7 @@
import com.google.gson.JsonSerializer;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.user.SMSHistory;

import com.yeshi.fanli.entity.bus.user.ThreeSale;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;

@@ -447,8 +448,27 @@
      BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));



      vo.setFinishGoldCoin(Long.parseLong(integralDetailService.getCumulativeMoney(uid).setScale(0).toString()));

      vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid,

            TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney));

		
//      vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid,

//            , payMoney));

		
      int finishTeam = 0;

      long vipBegin = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);

      List<ThreeSale> listThreeSale = threeSaleSerivce.getValidWorkerIdsByTime(uid, vipBegin);

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

         for (ThreeSale three: listThreeSale) {

            UserInfo worker = three.getWorker();

            if (worker == null || worker.getId() == null) {

               continue;

            }

            // 1、邀请关系成功后；2、单（分享 + 自购）实付款大于1元

            long countValid = hongBaoV2CountService.countValidOrderByUidAndTime(worker.getId(), three.getSucceedTime(), payMoney);

            if (countValid > 0) {

               finishTeam ++;

            }

         }

      }

      vo.setFinishTeam(finishTeam);

      vo.setFinishHongBao(banLiShopOrderService.countByUidAndState(uid, list));



      // 区分老用户和新用户

@@ -521,8 +541,27 @@
      BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));



      BigDecimal finishGoldCoin = integralDetailService.getCumulativeMoney(uid);

      long finishTeam = hongBaoV2CountService.countValidOrderTeamUserByUid(uid,

            TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney);

		
//      long finishTeam = hongBaoV2CountService.countValidOrderTeamUserByUid(uid,

//            TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney);

//	
      long finishTeam = 0L;

      long vipBegin = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);

      List<ThreeSale> listThreeSale = threeSaleSerivce.getValidWorkerIdsByTime(uid, vipBegin);

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

         for (ThreeSale three: listThreeSale) {

            UserInfo worker = three.getWorker();

            if (worker == null || worker.getId() == null) {

               continue;

            }

            // 1、邀请关系成功后；2、单（分享 + 自购）实付款大于1元

            long countValid = hongBaoV2CountService.countValidOrderByUidAndTime(worker.getId(), three.getSucceedTime(), payMoney);

            if (countValid > 0) {

               finishTeam ++;

            }

         }

      }

		
      long finishHongBao = banLiShopOrderService.countByUidAndState(uid, list);

      BigDecimal finishMoney = hongBaoV2CountService.getRewardMoneyBySelf(uid);