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}
- AND es.barcode = #{supermarketSpuQueryDTO.barcode}
+ AND u.barcode = #{supermarketSpuQueryDTO.barcode}
AND es.product_name LIKE CONCAT('%', #{supermarketSpuQueryDTO.productName}, '%')