|
@@ -67,6 +67,7 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
|
|
|
@Override
|
|
|
public List<UserCouponDTO> listUserCanUseCoupons(@NonNull UserCouponQueryParam param) {
|
|
|
String merchantId = param.getMerchantId();
|
|
|
+ BigDecimal totalAmount = param.getTotalAmount();
|
|
|
List<String> merchantIds = new ArrayList<>();
|
|
|
if(!StringUtils.isBlank(merchantId)){
|
|
|
if(merchantId.contains(",")){
|
|
@@ -79,7 +80,13 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
|
|
|
param.setMerchantIds(merchantIds);
|
|
|
Long userId = SessionContextHolder.getId();
|
|
|
// 当前用户对于当前商品可使用的优惠券列表
|
|
|
- return this.baseMapper.listUserCanUseCoupons(userId, param);
|
|
|
+ List<UserCouponDTO> result = this.baseMapper.listUserCanUseCoupons(userId, param);
|
|
|
+ if (CollectionUtils.isEmpty(result)) {
|
|
|
+ return Collections.emptyList();
|
|
|
+ }
|
|
|
+ return result.stream().filter(e ->
|
|
|
+ !CouponType.REDUCE.equals(e.getType()) || (CouponType.REDUCE.equals(e.getType()) && e.getDoorsillAmount().compareTo(totalAmount) <= 0))
|
|
|
+ .collect(Collectors.toList());
|
|
|
/*List<UserCoupon> userCoupons = this.baseMapper.listUserCanUseCoupons(userId, param);
|
|
|
if (CollectionUtils.isEmpty(userCoupons)) {
|
|
|
return Collections.emptyList();
|