From 9a38f81e7e7c817aa539416a41d33856209c7fe1 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 13 三月 2020 12:49:41 +0800
Subject: [PATCH] 有效粉丝统计bug
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserAccountController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserAccountController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserAccountController.java
index 92c80a6..98da7e0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserAccountController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserAccountController.java
@@ -33,6 +33,7 @@
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;
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.WeiXinUser;
@@ -52,6 +53,7 @@
import com.yeshi.fanli.service.inter.user.UserAccountService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
import com.yeshi.fanli.service.inter.user.wx.WXMPUserLoginService;
@@ -107,6 +109,11 @@
@Resource
private HongBaoV2CountService hongBaoV2CountService;
+
+ @Resource
+ private ThreeSaleSerivce threeSaleSerivce;
+
+
/**
* 閫氳繃閭�璇风爜鑾峰彇鐢ㄦ埛淇℃伅
@@ -545,8 +552,27 @@
list.add(BanLiShopOrder.STATE_SUCCESS);
BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));
- vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid,
- TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney));
+// vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid,
+// TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), 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));
// 鍖哄垎鑰佺敤鎴峰拰鏂扮敤鎴�
@@ -621,8 +647,28 @@
list.add(BanLiShopOrder.STATE_SUCCESS);
BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));
- 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);
--
Gitblit v1.8.0