在线商城条件查询

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SmSpuPageDTO.java

@@ -0,0 +1,10 @@
+package com.bsd.pjcloud.supermarket.dto;
+
+
+import lombok.Data;
+
+@Data
+public class SmSpuPageDTO {
+
+    private String productName;
+}

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java

@@ -12,6 +12,7 @@ import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.common.security.util.SecurityUtils;
+import com.bsd.pjcloud.supermarket.dto.SmSpuPageDTO;
 import com.bsd.pjcloud.supermarket.entity.SmErpCategoryEntity;
 import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity;
 import com.bsd.pjcloud.supermarket.entity.SmSpuEntity;
@@ -69,7 +70,7 @@ public class SmSpuController {
     @Operation(summary = "分页查询" , description = "分页查询" )
     @GetMapping("/page" )
     @PreAuthorize("@pms.hasPermission('supermarket_smSpu_view')" )
-    public R getSmSpuPage(@ParameterObject Page page, @ParameterObject SmSpuEntity smSpu) {
+    public R getSmSpuPage(@ParameterObject Page page, @ParameterObject SmSpuPageDTO smSpu) {
         return R.ok(smSpuService.pageScope(page, smSpu));
     }
 

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmSpuMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import com.bsd.pjcloud.supermarket.dto.SmSpuPageDTO;
 import com.bsd.pjcloud.supermarket.dto.SupermarketSpuAppQueryDTO;
 import com.bsd.pjcloud.supermarket.entity.SmSpuEntity;
 import com.bsd.pjcloud.supermarket.vo.OnlineShopVo;
@@ -26,7 +27,7 @@ public interface SmSpuMapper extends PjcloudBaseMapper<SmSpuEntity> {
      * @param of
      * @return
      */
-    IPage<SmErpPageScopeVo> selectSmErpPageScopeVo(Page page, @Param("smspu") SmSpuEntity smSpu, DataScope of);
+    IPage<SmErpPageScopeVo> selectSmErpPageScopeVo(Page page, @Param("smspu") SmSpuPageDTO smSpu, DataScope of);
 
 
     /**

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmSpuService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.supermarket.dto.SmSpuPageDTO;
 import com.bsd.pjcloud.supermarket.dto.SupermarketSpuAppQueryDTO;
 import com.bsd.pjcloud.supermarket.entity.SmSpuEntity;
 import com.bsd.pjcloud.supermarket.vo.OnlineShopVo;
@@ -15,7 +16,7 @@ public interface SmSpuService extends IService<SmSpuEntity> {
 
 
 
-    Object pageScope(Page page,  SmSpuEntity smSpu);
+    Object pageScope(Page page,  SmSpuPageDTO smSpu);
 
 
 

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmSpuServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.security.util.SecurityUtils;
+import com.bsd.pjcloud.supermarket.dto.SmSpuPageDTO;
 import com.bsd.pjcloud.supermarket.dto.SupermarketSpuAppQueryDTO;
 import com.bsd.pjcloud.supermarket.entity.SmSpuEntity;
 import com.bsd.pjcloud.supermarket.mapper.SmErpSpuMapper;
@@ -39,7 +40,7 @@ public class SmSpuServiceImpl extends ServiceImpl<SmSpuMapper, SmSpuEntity> impl
     private final SmErpUnitMapper smErpUnitMapper;
 
     @Override
-    public Object pageScope(Page page,  SmSpuEntity smSpu) {
+    public Object pageScope(Page page,  SmSpuPageDTO smSpu) {
         IPage<SmErpPageScopeVo> pageData = baseMapper.selectSmErpPageScopeVo(page,smSpu, DataScope.of());
         return pageData;
     }

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml

@@ -30,7 +30,13 @@
           on sp.erp_spu_id = esp.id
           left join sm_erp_category eca
           on esp.category_id = eca.id
-            where  sp.del_flag = 0
+          <where>
+              esp.del_flag = 0 and sp.del_flag = 0
+              <if test="smspu.productName != null">
+                  and esp.product_name like concat('%', #{smspu.productName}, '%')
+              </if>
+          </where>
+
     </select>
 
     <select id="getAppPage" resultType="com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuVo">
@@ -54,15 +60,19 @@
         </where>
     </select>
     <select id="getOnlineShopList" resultType="com.bsd.pjcloud.supermarket.vo.OnlineShopVo">
-        SELECT esp.id as erp_spu_id,esp.product_code,esp.barcode,esp.product_name,esp.category_id,
-                 esp.pic_url,esp.sort,esp.status,esp.merchant_id,esp.dept_id,
-                 sp.create_time,sp.id,sp.slider_pic_urls,
-                 eca.name as category_name
+        SELECT  esp.id as erp_spu_id,esp.product_code,esp.barcode,esp.product_name,esp.category_id,
+                 esp.pic_url,esp.sort,esp.status,esp.merchant_id,esp.dept_id,esp.bar_code,
+                 sp.create_time,sp.id,sp.slider_pic_urls,sp.description,
+                 eca.name as category_name,
+                 stock.current_stock as stock
         FROM `sm_spu` sp
         LEFT JOIN sm_erp_spu esp
         on sp.erp_spu_id = esp.id
         LEFT JOIN sm_erp_category eca
         on esp.category_id = eca.id
-        WHERE esp.status = 0 and sp.merchant_id=${categoryId}
+        left join sm_erp_stock stock
+        on esp.id = stock.erp_spu_id
+        WHERE esp.del_flag = 0 and sp.del_flag = 0 and
+            esp.status = 0 and esp.category_id=${categoryId}
     </select>
 </mapper>