From ccadf33e194d1ab4d9125228053f5507ff5dcb74 Mon Sep 17 00:00:00 2001
From: fxh <1763817137@qq.com>
Date: Fri, 15 Aug 2025 19:47:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/app/AppProductController.java  |  6 +++---
 .../wzj/soopin/goods/domain/vo/ProductVO.java  |  6 +++++-
 .../wzj/soopin/goods/mapper/ProductMapper.java |  3 +++
 .../goods/service/impl/ProductServiceImpl.java |  4 ++++
 .../resources/mapper/goods/ProductMapper.xml   | 18 ++++++++++++++++++
 5 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/org/dromara/app/AppProductController.java b/ruoyi-admin/src/main/java/org/dromara/app/AppProductController.java
index 3c7747bde..4319acd86 100644
--- a/ruoyi-admin/src/main/java/org/dromara/app/AppProductController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/app/AppProductController.java
@@ -23,11 +23,11 @@ public class AppProductController {
     private final ProductConvert convert;
     private final ProductService productService;
 
-    @Tag(name ="查询商品信息列表")
+    @Tag(name = "查询商品信息列表")
     @PostMapping("page")
     public R<IPage<ProductVO>> page(@RequestBody ProductBo query, Page<Product> page) {
-        Page<Product> productCategoryPage = service.page(page,query.toWrapper());
-        return R.ok(convert.toVO(productCategoryPage));
+        IPage<ProductVO> resultPage = service.getProduct(page, query);
+        return R.ok(resultPage);
     }
 
     @Tag(name ="获取商品信息详细信息")
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/vo/ProductVO.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/vo/ProductVO.java
index 47051b0ed..0ac86d006 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/vo/ProductVO.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/vo/ProductVO.java
@@ -106,7 +106,7 @@ public class ProductVO extends BaseAudit {
     @Schema(description = "SKU列表")
     private List<Sku> skuList;
 
-    @Schema(description = "店铺名称")
+    @Schema(description = "联系人")
     private String contactUserName;
 
     @Schema(description = "店铺手机号")
@@ -133,4 +133,8 @@ public class ProductVO extends BaseAudit {
     @Schema(description = "优惠金额")
     private BigDecimal discountPrice;
 
+    @Schema(description = "店铺名称")
+    private String storeName;
+
+
 }
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/mapper/ProductMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/mapper/ProductMapper.java
index 534321321..83654d270 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/mapper/ProductMapper.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/mapper/ProductMapper.java
@@ -50,4 +50,7 @@ public interface ProductMapper extends BaseMapper<Product> {
         "SUM(CASE WHEN auth_flag = 2 THEN 1 ELSE 0 END) AS count2 " +
         "FROM pms_product")
     Map<String, Object> countProduct();
+
+
+    IPage<ProductVO> getProduct(@Param("page") Page<Product> page,  @Param("query") ProductBo query);
 }
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java
index 5f03ed8e2..98ac5d919 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java
@@ -161,4 +161,8 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         //删除商品主表数据
         return productMapper.deleteById(id) > 0;
     }
+
+    public IPage<ProductVO> getProduct(Page<Product> page, ProductBo query) {
+        return productMapper.getProduct(page, query);
+    }
 }
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml
index 35321e25f..8bf5bf781 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml
@@ -130,6 +130,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             p.id = #{id}
     </select>
 
+    <select id="getProduct" resultType="com.wzj.soopin.goods.domain.vo.ProductVO">
+        SELECT
+        p.*,
+        t.store_name AS storeName
+        FROM
+        pms_product p
+        LEFT JOIN
+        sys_tenant t ON p.tenant_id = t.tenant_id
+        <where>
+            <if test="query.nameLike != null and query.nameLike != ''">
+                AND p.name LIKE CONCAT('%', #{query.nameLike}, '%')
+            </if>
+            <if test="query.categoryId != null">
+                AND p.category_id = #{query.categoryId}
+            </if>
+        </where>
+    </select>
+
     <resultMap id="ProductWithSkusResultMap" type="ProductVO">
         <id property="id" column="id"/>
         <result property="name" column="name"/>