|
@@ -1250,10 +1250,27 @@ public class CartClubServiceImpl implements CartClubService {
|
|
|
List<CartItemVo> productList = cartClubMapper.getCartProductsByShopId(shopId, userId);
|
|
|
// 未领取的优惠券
|
|
|
List<CouponVo> preCouponList = orderCommonMapper.getPrevCouponList(userId);
|
|
|
+ //剔除超级会员优惠券
|
|
|
+ List<Integer> vipCoupon =cartClubMapper.findVipCoupon();
|
|
|
+ if (preCouponList.size() > 0 && preCouponList != null) {
|
|
|
+ for (CouponVo couponVo : preCouponList) {
|
|
|
+ if (vipCoupon.contains(couponVo.getCouponId())) {
|
|
|
+ preCouponList.remove(couponVo);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
// 过滤与当前购物车商品无关的优惠券
|
|
|
filterCoupon(source, productList, preCouponList);
|
|
|
// 用户可用优惠券(已领取)
|
|
|
List<CouponVo> couponList = orderCommonMapper.getClubCouponList(userId);
|
|
|
+ //剔除超级会员优惠券
|
|
|
+ if (couponList.size() > 0 && couponList != null) {
|
|
|
+ for (CouponVo couponVo : couponList) {
|
|
|
+ if (vipCoupon.contains(couponVo.getCouponId())) {
|
|
|
+ couponList.remove(couponVo);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
// 过滤与当前购物车商品无关的优惠券
|
|
|
filterCoupon(source, productList, couponList);
|
|
|
Map<String, Object> map = new HashMap<>(3);
|