From d217e007800f3806c325a3198ea8210ba4b42802 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Mon, 17 Mar 2025 14:44:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=8D=93=E6=9C=BA=E8=B6=85=E5=B8=82?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supermarket/api/feign/RemoteSupermarketSpuService.java  | 3 ++-
 .../bsd/pjcloud/supermarket/dto/SupermarketSpuQueryDTO.java | 6 ------
 .../src/main/resources/mapper/SmErpSpuMapper.xml            | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java
index c3e755381..3c0ed7888 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java
@@ -20,6 +20,7 @@
 package com.bsd.pjcloud.supermarket.api.feign;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.feign.annotation.NoToken;
@@ -44,7 +45,7 @@ public interface RemoteSupermarketSpuService {
      * @return R
      */
     @PostMapping("/supermarketSpu/ad/selectListAll")
-    R getSupermarketSpuScope(@RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO);
+    R getSupermarketSpuScope(@RequestParam Page page,@RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO);
 
 
 
diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SupermarketSpuQueryDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SupermarketSpuQueryDTO.java
index 4e12dd5ef..10ef8edc2 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SupermarketSpuQueryDTO.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SupermarketSpuQueryDTO.java
@@ -45,10 +45,4 @@ public class SupermarketSpuQueryDTO {
     @Schema(description="商品性质(字典)")
     private String productNature;
 
-
-    /**
-     * 商户id
-     */
-    @Schema(description="商户id")
-    private Long merchantId;
 }
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml
index 0f91f0412..eb7e667fb 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml
@@ -82,7 +82,7 @@
                   AND es.product_code = #{supermarketSpuQueryDTO.productCode}
               </if>
               <if test="supermarketSpuQueryDTO.barcode != null">
-                  AND es.barcode = #{supermarketSpuQueryDTO.barcode}
+                  AND u.barcode = #{supermarketSpuQueryDTO.barcode}
               </if>
               <if test="supermarketSpuQueryDTO.productName != null">
                   AND es.product_name LIKE CONCAT('%', #{supermarketSpuQueryDTO.productName}, '%')