安卓机超市商品详情接口

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);
 
 
 

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;
 }

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}, '%')