From b3da9f82b7740d39742fef1a81a56c22fe1c8b9c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 08 六月 2020 17:27:02 +0800
Subject: [PATCH] 券后价调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 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 df705bc..470478f 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
@@ -140,7 +140,7 @@
@Override
public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment) {
- Long count = hongBaoV2CountMapper.countMyDirectOrderByCashArrival(uid, payment);
+ Long count = hongBaoV2CountMapper.countMyDirectOrderByCashArrival(uid, payment, null);
if (count == null) {
count = 0L;
}
@@ -149,13 +149,34 @@
@Override
+ public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment, Integer type) {
+ Long count = hongBaoV2CountMapper.countMyDirectOrderByCashArrival(uid, payment, type);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
+
+ @Override
+ public long countMyDirectOrderByCashNotArrival(Long uid, BigDecimal payment, Integer type) {
+ Long count = hongBaoV2CountMapper.countMyDirectOrderByCashNotArrival(uid, payment, type);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
+
+ @Override
public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType, List<Integer> listSource) {
- return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null, listSource);
+ BigDecimal money = hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null, listSource,false);
+ if (money == null)
+ money = BigDecimal.ZERO;
+ return money;
}
@Override
public BigDecimal geBonusByuid(Long uid, Integer dateType, Integer hbType, Integer moneyState) {
- BigDecimal money = hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, moneyState, null, null, null);
+ BigDecimal money = hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, moneyState, null, null, null,false);
if (money == null) {
money = new BigDecimal(0);
}
@@ -164,9 +185,9 @@
@Override
public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer orderType, Integer orderState,
- String orderNo, Integer moneyState, String startTime, String endTime, List<Integer> listSource) {
+ String orderNo, Integer moneyState, String startTime, String endTime, List<Integer> listSource, boolean notBackSuVip) {
return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, orderType, orderState, orderNo, moneyState,
- startTime, endTime, listSource);
+ startTime, endTime, listSource, notBackSuVip);
}
--
Gitblit v1.8.0