From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 11 +++++++----
1 files changed, 7 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 470478f..4d111e5 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
@@ -17,6 +17,8 @@
@Service
public class HongBaoV2CountServiceImpl implements HongBaoV2CountService {
+
+
@Resource
private HongBaoV2CountMapper hongBaoV2CountMapper;
@@ -168,15 +170,16 @@
@Override
public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType, List<Integer> listSource) {
- BigDecimal money = hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null, listSource,false);
+ BigDecimal money = hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null, listSource);
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,false);
+ BigDecimal money = hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, moneyState, null, null, null);
if (money == null) {
money = new BigDecimal(0);
}
@@ -185,9 +188,9 @@
@Override
public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer orderType, Integer orderState,
- String orderNo, Integer moneyState, String startTime, String endTime, List<Integer> listSource, boolean notBackSuVip) {
+ String orderNo, Integer moneyState, String startTime, String endTime, List<Integer> listSource) {
return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, orderType, orderState, orderNo, moneyState,
- startTime, endTime, listSource, notBackSuVip);
+ startTime, endTime, listSource);
}
--
Gitblit v1.8.0