From b2816070225e646ee54a5b2f56a8a565516f0e11 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 10 Dec 2025 16:13:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=93=81=20?=
 =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E7=B1=BB=E5=9E=8B=E7=9A=84=20?=
 =?UTF-8?q?=E5=9B=9E=E5=A1=AB=20=E4=BC=98=E6=83=A0=E5=88=B8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../market/service/impl/MkPointsGoodsServiceImpl.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

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 f138d883a..d4aa519ab 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
@@ -51,6 +51,7 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
             if (goods.getGoodsCategory().equals("优惠劵")) {
                 ShopCoupon one = shopCouponService.getOne(query().eq(ShopCoupon::getId, goods.getCouponId())
                         .eq(ShopCoupon::getShopId, shopId)
+                        .eq(ShopCoupon::getStatus, 1)
                         .eq(ShopCoupon::getIsDel, 0));
                 goods.setCouponInfo(one);
             }
@@ -64,6 +65,15 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
         MkPointsUser pointsUser = pointsUserService.getPointsUser(shopId, null, userId);
         PageHelper.startPage(page, size);
         List<MkPointsGoods> list = mapper.getPointsGoodsPageByUser(shopId, userId, goodsCategory.trim());
+        list.forEach(goods -> {
+            if (goods.getGoodsCategory().equals("优惠劵")) {
+                ShopCoupon one = shopCouponService.getOne(query().eq(ShopCoupon::getId, goods.getCouponId())
+                        .eq(ShopCoupon::getShopId, shopId)
+                        .eq(ShopCoupon::getStatus, 1)
+                        .eq(ShopCoupon::getIsDel, 0));
+                goods.setCouponInfo(one);
+            }
+        });
         result.put("pointsGoods", PageUtil.convert(new PageInfo<>(list)));
         result.put("pointsUser", pointsUser == null ? "" : pointsUser);
         return result;