From 9aa335f99a99c7e4b0e01b329bbd5d2c929fb3b8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 18:24:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 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 25684d4..502436e 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
@@ -28,6 +28,7 @@
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.system.SystemCoupon;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.exception.user.UserSystemCouponException;
import com.yeshi.fanli.log.LogHelper;
@@ -49,7 +50,9 @@
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.order.CommonOrderVO;
import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO;
@@ -62,6 +65,9 @@
@Resource(name = "taskExecutor")
private TaskExecutor executor;
+
+ @Resource
+ private RedisManager redisManager;
@Resource
private UserSystemCouponMapper userSystemCouponMapper;
@@ -420,8 +426,9 @@
Integer stateActivated = userCouponVO.getStateActivated();
if (stateActivated == null || stateActivated == 0) {
- userCouponVO.setCouponPicture(PIC_INVALID); // 鏈縺娲�
userCouponVO.setState(0);
+ userCouponVO.setCouponEffect("寰呮縺娲�");
+ userCouponVO.setCouponPicture(PIC_INVALID); // 鏈縺娲诲浘鐗�
} else {
userCouponVO.setCouponPicture(systemCoupon.getPicture());
}
@@ -498,9 +505,14 @@
}
@Override
- public List<UserSystemCouponVO> getGoodsCouponList(Long uid) throws UserSystemCouponException, Exception {
+ public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId) throws UserSystemCouponException, Exception {
+
if (uid == null) {
throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�");
+ }
+
+ if (auctionId == null) {
+ throw new UserSystemCouponException(1, "鍟嗗搧ID涓虹┖");
}
// 鏇存柊杩囨湡鍒�
@@ -514,7 +526,26 @@
return null;
}
- return getEnableListByCouponId(uid, null, couponList);
+ List<UserSystemCouponVO> list = getEnableListByCouponId(uid, null, couponList);
+
+ // 鑾峰彇鍟嗗搧璇︽儏
+ TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
+ if (taoBaoGoodsBrief != null) {
+ BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
+
+ // 鍒稿悗浠� 澶т簬10鍏� 涓嶈兘鍏嶅崟
+ if (quanPrice.compareTo(new BigDecimal(10)) > 0) {
+ if (list != null && list.size() > 0) {
+ for (UserSystemCouponVO userCouponVO: list) {
+ // 鏄剧ず涓嶈兘浣跨敤
+ userCouponVO.setState(0);
+ userCouponVO.setCouponPicture(PIC_INVALID);
+ }
+ }
+ }
+ }
+
+ return list;
}
@Override
--
Gitblit v1.8.0