From c6b07c598a9585a68547ffc2a9b540ca74a3920b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 九月 2019 18:36:35 +0800
Subject: [PATCH] 项目名称bug修改，京东商品推荐修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 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 6187852..207fb6a 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
@@ -667,6 +667,23 @@
}
+ @Override
+ public long countUsableRewardCoupon (Long uid) {
+ if (uid == null)
+ return 0;
+
+ List<SystemCoupon> couponList = systemCouponService.getOrderCouponList();
+ if (couponList == null || couponList.size() == 0)
+ return 0;
+
+ List<Long> listCouponId = new ArrayList<Long>();
+ for (SystemCoupon systemCoupon : couponList) {
+ listCouponId.add(systemCoupon.getId());
+ }
+
+ return userSystemCouponMapper.countUsableByUid(uid, listCouponId);
+ }
+
@Transactional
@Override
@@ -1773,7 +1790,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;
}
@@ -2399,4 +2416,10 @@
return listCoupon;
}
+
+
+ @Override
+ public List<UserSystemCoupon> getFreeCouponByType(Long uid, String type) {
+ return userSystemCouponMapper.getFreeCouponByType(uid, type);
+ }
}
--
Gitblit v1.8.0