From 1d896d30efc6124253ead3d82780beb5d8b695fe Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 10 Dec 2025 14:28:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/controller/user/UPointGoodsController.java    | 3 ++-
 .../java/com/czg/market/service/MkPointsGoodsService.java | 8 ++++----
 .../czg/service/market/mapper/MkPointsGoodsMapper.java    | 2 +-
 .../market/service/impl/MkPointsGoodsServiceImpl.java     | 4 ++--
 .../src/main/resources/mapper/MkPointsGoodsMapper.xml     | 3 +++
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java b/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java
index 0f4d53eeb..24fef3633 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java
@@ -39,8 +39,9 @@ public class UPointGoodsController {
     @GetMapping("/page")
     public CzgResult<Page<MkPointsGoods>> getPointsGoodsSettingPage(@RequestParam(defaultValue = "1", required = false) Integer page,
                                                                     @RequestParam(defaultValue = "10", required = false) Integer size,
+                                                                    @RequestParam(required = false) String goodsCategory,
                                                                     Long shopId) {
-        Page<MkPointsGoods> data = pointsGoodsService.getPointsGoodsPageByUser(page, size, shopId, StpKit.USER.getLoginIdAsLong());
+        Page<MkPointsGoods> data = pointsGoodsService.getPointsGoodsPageByUser(page, size, shopId, goodsCategory, StpKit.USER.getLoginIdAsLong());
         return CzgResult.success(data);
     }
 
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java
index a4a2eb05d..25d8629bf 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java
@@ -17,7 +17,7 @@ public interface MkPointsGoodsService extends IService<MkPointsGoods> {
 
     Page<MkPointsGoods> getPointsGoodsPage(BaseQueryParam param, Long shopId);
 
-    Page<MkPointsGoods> getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, Long userId);
+    Page<MkPointsGoods> getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, String goodsCategory, Long userId);
 
     Page<MkPointsGoodsRecord> getGoodsRecordPage(Integer page, Integer size, Long shopId, Long userId);
 
@@ -29,9 +29,9 @@ public interface MkPointsGoodsService extends IService<MkPointsGoods> {
     /**
      * 更新商品数量
      *
-     * @param id 商品id
-     * @param quantity  库存数量 最终值
-     * @param totalExchangeCount    累计兑换数量 最终值
+     * @param id                 商品id
+     * @param quantity           库存数量 最终值
+     * @param totalExchangeCount 累计兑换数量 最终值
      */
     boolean upNumberById(Long id, Integer quantity, Integer totalExchangeCount);
 }
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkPointsGoodsMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkPointsGoodsMapper.java
index 790ffbb61..df4d314d6 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkPointsGoodsMapper.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkPointsGoodsMapper.java
@@ -13,5 +13,5 @@ import java.util.List;
  */
 public interface MkPointsGoodsMapper extends BaseMapper<MkPointsGoods> {
 
-    List<MkPointsGoods> getPointsGoodsPageByUser(Long shopId, Long userId);
+    List<MkPointsGoods> getPointsGoodsPageByUser(Long shopId, Long userId,String goodsCategory);
 }
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 ff4091eb2..6b15d4587 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
@@ -57,9 +57,9 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
     }
 
     @Override
-    public Page<MkPointsGoods> getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, Long userId) {
+    public Page<MkPointsGoods> getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, String goodsCategory, Long userId) {
         PageHelper.startPage(page, size);
-        List<MkPointsGoods> list = mapper.getPointsGoodsPageByUser(shopId, userId);
+        List<MkPointsGoods> list = mapper.getPointsGoodsPageByUser(shopId, userId,goodsCategory);
         return PageUtil.convert(new PageInfo<>(list));
     }
 
diff --git a/cash-service/market-service/src/main/resources/mapper/MkPointsGoodsMapper.xml b/cash-service/market-service/src/main/resources/mapper/MkPointsGoodsMapper.xml
index 64118b14a..6739ea892 100644
--- a/cash-service/market-service/src/main/resources/mapper/MkPointsGoodsMapper.xml
+++ b/cash-service/market-service/src/main/resources/mapper/MkPointsGoodsMapper.xml
@@ -12,6 +12,9 @@
         where goods.shop_id = #{shopId}
           and goods.del_flag = 0
           and goods.status = 1
+          <if test="goodsCategory != null and goodsCategory !=''">
+            and goods.goods_category = #{goodsCategory}
+        </if>
         order by goods.sort desc, goods.id desc
     </select>
 </mapper>