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/config/SystemCouponServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemCouponServiceImpl.java
index 3029032..72b3947 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemCouponServiceImpl.java
@@ -63,12 +63,20 @@
}
@Override
+ @Cacheable(value = "systemCouponCache",key="'getGiveFreeCouponList'")
+ public List<SystemCoupon> getGiveFreeCouponList() {
+ List<String> listType = new ArrayList<String>();
+ listType.add(CouponTypeEnum.freeCouponGive.name());
+ return systemCouponMapper.getCouponListByType(listType);
+ }
+
+ @Override
@Cacheable(value = "systemCouponCache",key="'getGoodsCouponList'")
public List<SystemCoupon> getGoodsCouponList() {
List<String> listType = new ArrayList<String>();
listType.add(CouponTypeEnum.freeCoupon.name());
listType.add(CouponTypeEnum.welfareFreeCoupon.name());
-
+ listType.add(CouponTypeEnum.freeCouponBuy.name());
return systemCouponMapper.getCouponListByType(listType);
}
--
Gitblit v1.8.0