From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserSystemCouponCountServiceImpl.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserSystemCouponCountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserSystemCouponCountServiceImpl.java
index daeafa1..6ca537f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserSystemCouponCountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserSystemCouponCountServiceImpl.java
@@ -3,7 +3,6 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import javax.annotation.Resource;
@@ -14,7 +13,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
-import com.yeshi.fanli.entity.system.SystemCoupon;
+import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.service.inter.config.SystemCouponService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.count.UserSystemCouponCountService;
@@ -140,11 +139,13 @@
}
for (SystemCouponVO systemCouponVO: list) {
+ BigDecimal money = null;
+ if (systemCouponVO.getType() != CouponTypeEnum.freeCouponGive)
+ money = userSystemCouponCountMapper.countFreeMoneyByCouponId(systemCouponVO.getId());
- BigDecimal money = userSystemCouponCountMapper.countFreeMoneyByCouponId(systemCouponVO.getId());
- if (money == null) {
+ if (money == null)
money = new BigDecimal(0);
- }
+
systemCouponVO.setMoney(money);
}
return list;
@@ -260,21 +261,20 @@
@Override
- public List<Map<String, Object>> getRebateCouponUsedNumToCharts(Integer dateType, String year,
- String startTime, String endTime){
- return userSystemCouponCountMapper.getRebateCouponUsedNumToCharts(dateType, year, startTime, endTime);
+ public BigDecimal countRebateMoneyByDay(String preDay){
+ return userSystemCouponCountMapper.countRebateMoneyByDay(preDay);
}
- @Override
- public List<Map<String, Object>> getRebateCouponMoneyToCharts(Integer dateType, String year,
- String startTime, String endTime){
- return userSystemCouponCountMapper.getRebateCouponMoneyToCharts(dateType, year, startTime, endTime);
- }
@Override
- public List<Map<String, Object>> getFreeCouponMoneyToCharts(Integer dateType, String year, String startTime,
- String endTime, String couponType){
- return userSystemCouponCountMapper.getFreeCouponMoneyToCharts(dateType, year, startTime, endTime, couponType);
+ public BigDecimal countFreeMoneyByTypeAndDay(CouponTypeEnum typeEnum, String preDay){
+ return userSystemCouponCountMapper.countFreeMoneyByTypeAndDay(typeEnum.name(), preDay);
+ }
+
+
+ @Override
+ public BigDecimal countCouponNumByDay(CouponTypeEnum typeEnum, String preDay){
+ return userSystemCouponCountMapper.countCouponNumByDay(typeEnum.name(), preDay);
}
}
--
Gitblit v1.8.0