From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级
---
fanli/src/main/java/com/yeshi/fanli/service/manger/order/OrderMoneyStatisticManager.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/OrderMoneyStatisticManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/OrderMoneyStatisticManager.java
index b04434f..18407d8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/OrderMoneyStatisticManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/OrderMoneyStatisticManager.java
@@ -17,11 +17,11 @@
import com.yeshi.fanli.dao.mybatis.order.UserOrderDailyStatisticMapper;
import com.yeshi.fanli.entity.bus.user.ThreeSaleDetail;
import com.yeshi.fanli.entity.order.OrderMoneyDailyCount;
-import com.yeshi.fanli.entity.order.OrderMoneyDailyCount.SourceTypeEnum;
+import com.yeshi.fanli.entity.order.SourceTypeEnum;
import com.yeshi.fanli.entity.order.dividents.TeamDividentsSourceOrderUserMap;
import com.yeshi.fanli.service.inter.order.OrderMoneyDailyCountService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleDetailService;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
@Component
public class OrderMoneyStatisticManager {
@@ -179,6 +179,14 @@
public void syncDividents(Date minTime, Date maxTime) {
List<UserOrderDailyStatisticDTO> list = userOrderDailyStatisticMapper.listDividentsOrderByCreateTime(minTime,
maxTime);
+
+ List<UserOrderDailyStatisticDTO> countList = userOrderDailyStatisticMapper
+ .listDividentsOrderCountByCreateTime(minTime, maxTime);
+ Map<String, Integer> countMap = new HashMap<>();
+ for (UserOrderDailyStatisticDTO dto : countList) {
+ countMap.put(dto.getDay() + "#" + dto.getUid(), dto.getOrderCount());
+ }
+
if (list != null)
for (UserOrderDailyStatisticDTO dto : list) {
OrderMoneyDailyCount count = new OrderMoneyDailyCount();
@@ -194,12 +202,17 @@
count.setTeamSubsidyNum(dto.getOrderCount());
}
+ Integer totalCount = countMap.get(dto.getDay() + "#" + dto.getUid());
+ if(totalCount!=null){
+ count.setTeamDividentsOrderNum(totalCount);
+ }
+
count.setYearMonth(
TimeUtil.getGernalTime(TimeUtil.convertToTimeTemp(dto.getDay(), "yyyy-MM-dd"), "yyyy-MM"));
- if(dto.getDay().equalsIgnoreCase("2020-05-03")&&dto.getUid()==389677L){
+ if (dto.getDay().equalsIgnoreCase("2020-05-03") && dto.getUid() == 389677L) {
System.out.println(dto);
}
-
+
orderMoneyDailyCountService.saveDailyCount(count);
}
--
Gitblit v1.8.0