From e35bf36eca5d2bdf59ddfe489f69ad44ef0eb67b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 17 九月 2019 09:45:34 +0800
Subject: [PATCH] 品牌
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
index a30eec6..83f1e6b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -1769,6 +1769,7 @@
// 璁㈠崟鍒楄〃
jumpLink.put("state", "2"); // 宸叉敹璐�
+ jumpLink.put("showNav", false); // 涓嶆樉绀轰笂鏂圭粺璁′俊鎭�
jumpLink.put("type", "1"); // 杩斿埄璁㈠崟
jumpLink.put("title", "杩斿埄璁㈠崟"); // 鏍囬鍚�
jumpLink.put("goodsType", "0"); // 璁㈠崟鏉ユ簮
@@ -1790,7 +1791,7 @@
if (CouponTypeEnum.rebatePercentCoupon == type) {
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
- tips = configService.get("give_free_coupon_tips");
+ tips = configService.get("give_rebate_percent_coupon_tips");
tokenType = TokenTypeEnum.rebatePercentCoupon;
}
@@ -2416,4 +2417,10 @@
return listCoupon;
}
+
+
+ @Override
+ public List<UserSystemCoupon> getFreeCouponByType(Long uid, String type) {
+ return userSystemCouponMapper.getFreeCouponByType(uid, type);
+ }
}
--
Gitblit v1.8.0