From 020d940ae4e16f55f69cef3dd4c8dc0b9764af07 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 26 六月 2019 10:59:48 +0800
Subject: [PATCH] 邀请对应奖励红包加入版本区分

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
index 103e439..b4b4726 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
@@ -277,13 +277,15 @@
 		auditRecord.setBeforeMoney(user.getMyHongBao());
 		auditRecord.setExtract(extract);
 
+		Date minTime = new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 180L);
 		// 缁熻鏁版嵁
-		int orderCount50More = orderUserStatisticService.countHongBaoOrderCount50MoreByUid(user.getId());
-		BigDecimal weiQuanOrderFanAmount = orderUserStatisticService.sumWeiQuanOrderFanAmountByUid(user.getId());
-		int weiQuanOrderCount = orderUserStatisticService.countWeiQuanOrderByUid(user.getId());
-		int safeOrderCount = orderUserStatisticService.countSafeOrderByUid(user.getId());
-		auditRecord.setExtraInfoStr(new Gson().toJson(new ExtractOrderStatisticDTO(orderCount50More, weiQuanOrderCount,
-				weiQuanOrderFanAmount, safeOrderCount)));
+		int orderCount50More = orderUserStatisticService.countOrderCount100MoreByUidAndMinTime(user.getId(), minTime);
+
+		BigDecimal weiQuanOrderFanAmount = orderUserStatisticService.sumWeiQuanOrderFanAmountByUid(user.getId(),
+				minTime);
+		int weiQuanOrderCount = orderUserStatisticService.countWeiQuanOrderByUid(user.getId(), minTime);
+		auditRecord.setExtraInfoStr(new Gson()
+				.toJson(new ExtractOrderStatisticDTO(orderCount50More, weiQuanOrderCount, weiQuanOrderFanAmount, 0)));
 		extractAuditRecordMapper.insertSelective(auditRecord);
 
 		// 鏂扮増璧勯噾璇︽儏

--
Gitblit v1.8.0