From 9eeec41fe8733afde21d0fe13239e0105454c41f Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 10 Dec 2025 14:06:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=93=81=E5=A1=AB?=
 =?UTF-8?q?=E5=85=85=E4=BC=98=E6=83=A0=E5=88=B8=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/market/entity/MkPointsGoods.java    |  7 +++++++
 .../service/impl/MkPointsGoodsServiceImpl.java  | 17 +++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkPointsGoods.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkPointsGoods.java
index f10c46dca..ef0db8a0a 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkPointsGoods.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkPointsGoods.java
@@ -126,5 +126,12 @@ public class MkPointsGoods implements Serializable {
      * 逻辑删除标志 1-是 0-否
      */
     private Integer delFlag;
+    /**
+     * 优惠券信息
+     */
+    @Column(ignore = true)
+    private ShopCoupon couponInfo;
+
+
 
 }
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 7e34e5545..ff4091eb2 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
@@ -4,7 +4,9 @@ import com.czg.BaseQueryParam;
 import com.czg.exception.CzgException;
 import com.czg.market.entity.MkPointsGoodsRecord;
 import com.czg.market.entity.MkPointsUserRecord;
+import com.czg.market.entity.ShopCoupon;
 import com.czg.market.service.MkPointsGoodsRecordService;
+import com.czg.market.service.ShopCouponService;
 import com.czg.order.dto.PointGoodsRefundDTO;
 import com.czg.utils.PageUtil;
 import com.github.pagehelper.PageHelper;
@@ -31,16 +33,27 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
 
     @Resource
     private MkPointsGoodsRecordService goodsRecordService;
+    @Resource
+    private ShopCouponService shopCouponService;
 
     @Override
     public Page<MkPointsGoods> getPointsGoodsPage(BaseQueryParam param, Long shopId) {
-        return page(Page.of(param.getPage(), param.getSize()),
+        Page<MkPointsGoods> page = page(Page.of(param.getPage(), param.getSize()),
                 query()
                         .eq(MkPointsGoods::getShopId, shopId)
                         .eq(MkPointsGoods::getDelFlag, 0)
                         .orderBy(MkPointsGoods::getSort, false)
                         .orderBy(MkPointsGoods::getId, false)
         );
+        page.getRecords().forEach(goods -> {
+            if (goods.getGoodsCategory().equals("优惠劵")) {
+                ShopCoupon one = shopCouponService.getOne(query().eq(ShopCoupon::getId, goods.getCouponId())
+                        .eq(ShopCoupon::getShopId, shopId)
+                        .eq(ShopCoupon::getIsDel, 0));
+                goods.setCouponInfo(one);
+            }
+        });
+        return page;
     }
 
     @Override
@@ -81,7 +94,7 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
         MkPointsGoodsRecord record = new MkPointsGoodsRecord();
         if (record1.getCheckoutTime() != null) {
             record.setStatus("已完成");
-        }else {
+        } else {
             record.setStatus("待核销");
         }
         record.setCancelOrRefundReason(param.getReason());