From 004fdfb7f9c02e69b1a5dd4add1461bd4ce83855 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 22 七月 2019 16:27:52 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 99a99f9..fdfbf59 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);
// 鏂扮増璧勯噾璇︽儏
@@ -732,7 +734,7 @@
}
@Override
- public double countTodayMoney(Long uid) {
- return extractMapper.countTodayMoney(uid);
+ public BigDecimal sumTodayApplyMoney(Long uid,String day) {
+ return extractMapper.sumToadyApplyByUid(uid,day);
}
}
--
Gitblit v1.8.0