From a4e4101f3e68aaaeea3e280ad89b20818f40f534 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期六, 14 三月 2020 15:15:26 +0800
Subject: [PATCH] 分享订单奖励 计算说明
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
index 2653913..d6a4642 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
@@ -8,6 +8,7 @@
import javax.annotation.Resource;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
import org.yeshi.utils.DateUtil;
@@ -168,6 +169,15 @@
return hongBaoV2CountMapper.countHongBaoType(dateType, type, year, startTime, endTime);
}
+
+
+ @Override
+ public Integer countOrderByTypeAndDate(Integer orderType, String preDay) {
+ return hongBaoV2CountMapper.countOrderByTypeAndDate(orderType, preDay);
+ }
+
+
+
@Override
public List<ChartTDO> getProportionByType(Integer dateType, Integer type, String year, String startTime,
String endTime) throws Exception {
@@ -339,13 +349,25 @@
}
@Override
- public long countValidOrderTeamUserByUid(Long uid, String date, BigDecimal payment) {
- return hongBaoV2CountMapper.countValidOrderTeamUserByUid(uid, date, payment);
+ public long countValidOrderByUidAndTime(Long uid, Long time, BigDecimal payment) {
+ Long count = hongBaoV2CountMapper.countValidOrderByUidAndTime(uid, time, payment);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
}
@Override
- public BigDecimal getRewardMoneyByDate(Long uid, Integer dateType, Integer hbType, Integer orderState) {
- return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, orderState);
+ public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType, List<Integer> listSource) {
+ return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null, listSource);
+ }
+
+
+ @Override
+ public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer orderType, Integer orderState,
+ String orderNo, Integer moneyState, String startTime, String endTime, List<Integer> listSource) {
+ return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, orderType, orderState, orderNo, moneyState,
+ startTime, endTime, listSource);
}
}
--
Gitblit v1.8.0