diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java index 0d77d0b60..ca601bfd2 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java @@ -65,16 +65,9 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl result = new HashMap<>(2); MkPointsUser pointsUser = pointsUserService.getPointsUser(shopId, null, userId); PageHelper.startPage(page, size); - if (StrUtil.isNotBlank(goodsCategory)) { - if (goodsCategory.contains("优惠劵")) { - goodsCategory = "优惠劵"; - } else if (goodsCategory.contains("其他商品")) { - goodsCategory = "其他商品"; - } - } List list = mapper.getPointsGoodsPageByUser(shopId, userId, StrUtil.trim(goodsCategory)); list.forEach(goods -> { - if (goods.getGoodsCategory().equals("优惠劵")) { + if (goods.getGoodsCategory().equals("优惠券")) { ShopCoupon one = shopCouponService.getOne(query().eq(ShopCoupon::getId, goods.getCouponId()) .eq(ShopCoupon::getShopId, shopId) .eq(ShopCoupon::getStatus, 1)