From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderUserStatisticServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderUserStatisticServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderUserStatisticServiceImpl.java
index 4942d70..c32bfe0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderUserStatisticServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderUserStatisticServiceImpl.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.order;
import java.math.BigDecimal;
+import java.util.Date;
import javax.annotation.Resource;
@@ -16,24 +17,24 @@
private HongBaoOrderMapper hongBaoOrderMapper;
@Override
- public int countHongBaoOrderCount50MoreByUid(Long uid) {
- return hongBaoOrderMapper.countHongBaoOrderCountMoreByUid(new BigDecimal(50), uid);
+ public int countOrderCount100MoreByUidAndMinTime(Long uid, Date minTime) {
+ return hongBaoOrderMapper.countOrderCountMoneyMoreByUidAndMinTime(uid, minTime, new BigDecimal(100));
}
@Override
- public int countWeiQuanOrderByUid(Long uid) {
- return hongBaoOrderMapper.countWeiQuanOrderByUid(uid);
+ public int countWeiQuanOrderByUid(Long uid, Date minTime) {
+ return hongBaoOrderMapper.countWeiQuanOrderByUid(uid, minTime);
}
@Override
- public BigDecimal sumWeiQuanOrderFanAmountByUid(Long uid) {
- BigDecimal money = hongBaoOrderMapper.sumWeiQuanOrderFanAmountByUid(uid);
+ public BigDecimal sumWeiQuanOrderFanAmountByUid(Long uid,Date minTime) {
+ BigDecimal money = hongBaoOrderMapper.sumWeiQuanOrderFanAmountByUid(uid,minTime);
return money == null ? new BigDecimal(0) : money;
}
@Override
- public int countSafeOrderByUid(Long uid) {
- return hongBaoOrderMapper.countSafeOrderByUid(uid);
+ public int countWeiQuanOrderWithMinCommision(Long uid, BigDecimal minMoney, Date minTime) {
+ return hongBaoOrderMapper.countWeiQuanOrderWithMinCommision(uid, minMoney, minTime);
}
}
--
Gitblit v1.8.0