From 61c21f17b1ad94e4b0018c7e385195bab21b0b5c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 09 九月 2019 19:00:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemCouponServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 76f36ad..8535f7a 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
@@ -54,7 +54,7 @@
}
@Override
- @Cacheable(value = "systemCouponCache",key="'getOrderCouponList")
+ @Cacheable(value = "systemCouponCache",key="'getOrderCouponList'")
public List<SystemCoupon> getOrderCouponList() {
List<String> listType = new ArrayList<String>();
listType.add(CouponTypeEnum.rebatePercentCoupon.name());
@@ -68,7 +68,7 @@
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