优惠卷列表
This commit is contained in:
@@ -52,11 +52,11 @@ public class TbUserCouponsServiceImpl implements TbUserCouponsService {
|
|||||||
List<ShopUserListVo> tbShopUsers = tbShopUserMapper.selectByUserId(couponDto.getUserId().toString(), couponDto.getShopId()==null?null:couponDto.getShopId().toString());
|
List<ShopUserListVo> tbShopUsers = tbShopUserMapper.selectByUserId(couponDto.getUserId().toString(), couponDto.getShopId()==null?null:couponDto.getShopId().toString());
|
||||||
if (!CollectionUtils.isEmpty(tbShopUsers)) {
|
if (!CollectionUtils.isEmpty(tbShopUsers)) {
|
||||||
tbShopUsers.forEach(s -> {
|
tbShopUsers.forEach(s -> {
|
||||||
if (couponDto.getStatus()==null || (couponDto.getStatus() != null && couponDto.getStatus() != 0)) {
|
if (couponDto.getStatus()==null || (couponDto.getStatus() != null && couponDto.getStatus() == 0)) {
|
||||||
List<UserCouponVo> unuseCoupon = inRecordMapper.queryVipPro(s.getMemberId().intValue(), s.getShopId().intValue());
|
List<UserCouponVo> unuseCoupon = inRecordMapper.queryVipPro(s.getMemberId().intValue(), s.getShopId().intValue());
|
||||||
result.addAll(unuseCoupon);
|
result.addAll(unuseCoupon);
|
||||||
}
|
}
|
||||||
if (couponDto.getStatus()==null || (couponDto.getStatus() != null && couponDto.getStatus() != 1)) {
|
if (couponDto.getStatus()==null || (couponDto.getStatus() != null && couponDto.getStatus() == 1)) {
|
||||||
List<UserCouponVo> useCoupon = outRecordMapper.queryVipPro(s.getMemberId().intValue(), s.getShopId().intValue());
|
List<UserCouponVo> useCoupon = outRecordMapper.queryVipPro(s.getMemberId().intValue(), s.getShopId().intValue());
|
||||||
result.addAll(useCoupon);
|
result.addAll(useCoupon);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user