超市接口修改

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

@@ -19,6 +19,7 @@ import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity;
 import com.bsd.pjcloud.supermarket.service.SmErpAuxiliaryCodeService;
 import com.bsd.pjcloud.supermarket.service.SmErpSpuService;
 import com.bsd.pjcloud.supermarket.service.SmErpUnitService;
+import com.bsd.pjcloud.supermarket.service.SmSpuService;
 import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -53,6 +54,8 @@ public class SmErpSpuController {
 
     private final SmErpAuxiliaryCodeService smErpAuxiliaryCodeService;
 
+    private final SmSpuService smSpuService;
+
     /**
      * 分页查询
      * @param page 分页对象
@@ -212,17 +215,19 @@ public class SmErpSpuController {
     @PostMapping("/app/selectListAll" )
     @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_view')" )
     public R getSupermarketSpu(@RequestBody SupermarketSpuAppQueryDTO supermarketSpuQueryDTO,@ParameterObject Page page) {
-        LambdaQueryWrapper<SmErpSpuEntity>  wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(supermarketSpuQueryDTO.getMerchantId() != null, SmErpSpuEntity::getMerchantId, supermarketSpuQueryDTO.getMerchantId());
-        wrapper.eq(supermarketSpuQueryDTO.getCategoryId() != null, SmErpSpuEntity::getCategoryId, supermarketSpuQueryDTO.getCategoryId());
-//        wrapper.eq(StrUtil.isNotBlank(supermarketSpuQueryDTO.getProductCode()), SupermarketSpuEntity::getProductCode, supermarketSpuQueryDTO.getProductCode());
-//        wrapper.eq(StrUtil.isNotBlank(supermarketSpuQueryDTO.getBarcode()), SupermarketSpuEntity::getBarcode, supermarketSpuQueryDTO.getBarcode());
-        wrapper.like(StrUtil.isNotBlank(supermarketSpuQueryDTO.getProductName()), SmErpSpuEntity::getProductName, supermarketSpuQueryDTO.getProductName());
-        Page pageDate = smErpSpuService.page(page, wrapper);
-        List list = pageDate.getRecords();
-        List<SupermarketAppSpuVo> bean = BeanUtils.toBean(list, SupermarketAppSpuVo.class);
-        pageDate.setRecords(bean);
-        return R.ok(pageDate);
+        return R.ok(smSpuService.getAppPage(page,supermarketSpuQueryDTO));
+
+//        LambdaQueryWrapper<SmErpSpuEntity>  wrapper = new LambdaQueryWrapper<>();
+//        wrapper.eq(supermarketSpuQueryDTO.getMerchantId() != null, SmErpSpuEntity::getMerchantId, supermarketSpuQueryDTO.getMerchantId());
+//        wrapper.eq(supermarketSpuQueryDTO.getCategoryId() != null, SmErpSpuEntity::getCategoryId, supermarketSpuQueryDTO.getCategoryId());
+////        wrapper.eq(StrUtil.isNotBlank(supermarketSpuQueryDTO.getProductCode()), SupermarketSpuEntity::getProductCode, supermarketSpuQueryDTO.getProductCode());
+////        wrapper.eq(StrUtil.isNotBlank(supermarketSpuQueryDTO.getBarcode()), SupermarketSpuEntity::getBarcode, supermarketSpuQueryDTO.getBarcode());
+//        wrapper.like(StrUtil.isNotBlank(supermarketSpuQueryDTO.getProductName()), SmErpSpuEntity::getProductName, supermarketSpuQueryDTO.getProductName());
+//        Page pageDate = smErpSpuService.page(page, wrapper);
+//        List list = pageDate.getRecords();
+//        List<SupermarketAppSpuVo> bean = BeanUtils.toBean(list, SupermarketAppSpuVo.class);
+//        pageDate.setRecords(bean);
+//        return R.ok(pageDate);
     }
 
     /**

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

@@ -5,7 +5,9 @@ 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.SupermarketSpuAppQueryDTO;
 import com.bsd.pjcloud.supermarket.entity.SmSpuEntity;
+import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuVo;
 import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpPageScopeVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -22,4 +24,13 @@ public interface SmSpuMapper extends PjcloudBaseMapper<SmSpuEntity> {
      * @return
      */
     IPage<SmErpPageScopeVo> selectSmErpPageScopeVo(Page page, @Param("smspu") SmSpuEntity smSpu, DataScope of);
+
+
+    /**
+     * 移动端分页获取线上商品数据
+     * @param page
+     * @param supermarketSpuQueryDTO
+     * @return
+     */
+    IPage<SupermarketAppSpuVo> getAppPage(Page page, @Param("supermarketSpuQueryDTO")SupermarketSpuAppQueryDTO supermarketSpuQueryDTO);
 }

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

@@ -3,11 +3,19 @@ package com.bsd.pjcloud.supermarket.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.supermarket.dto.SupermarketSpuAppQueryDTO;
 import com.bsd.pjcloud.supermarket.entity.SmSpuEntity;
+import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuVo;
+
+import java.util.List;
 
 public interface SmSpuService extends IService<SmSpuEntity> {
 
 
 
     Object pageScope(Page page,  SmSpuEntity smSpu);
+
+
+
+    Object getAppPage(Page page, SupermarketSpuAppQueryDTO supermarketSpuQueryDTO);
 }

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

@@ -5,11 +5,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
+import com.bsd.pjcloud.supermarket.dto.SupermarketSpuAppQueryDTO;
 import com.bsd.pjcloud.supermarket.entity.SmSpuEntity;
 import com.bsd.pjcloud.supermarket.mapper.SmErpSpuMapper;
 import com.bsd.pjcloud.supermarket.mapper.SmErpUnitMapper;
 import com.bsd.pjcloud.supermarket.mapper.SmSpuMapper;
 import com.bsd.pjcloud.supermarket.service.SmSpuService;
+import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuVo;
 import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpPageScopeVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -35,4 +37,10 @@ public class SmSpuServiceImpl extends ServiceImpl<SmSpuMapper, SmSpuEntity> impl
         IPage<SmErpPageScopeVo> pageData = baseMapper.selectSmErpPageScopeVo(page,smSpu, DataScope.of());
         return pageData;
     }
+
+    @Override
+    public Object getAppPage(Page page, SupermarketSpuAppQueryDTO supermarketSpuQueryDTO) {
+        IPage<SupermarketAppSpuVo> appPage=baseMapper.getAppPage(page,supermarketSpuQueryDTO);
+        return appPage;
+    }
 }

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

@@ -32,4 +32,17 @@
           on esp.category_id = eca.id
 
     </select>
+
+    <select id="getAppPage" resultType="com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuVo">
+        SELECT esp.product_name, esp.pic_url, esp.stock, esp.sales_count, esp.retail_price, esp.promotion_price
+        FROM `sm_spu` sp
+                 LEFT JOIN sm_erp_spu esp
+                           on sp.erp_spu_id = esp.id
+        <where>
+            esp.status = 0 and esp.merchant_id=${supermarketSpuQueryDTO.merchantId}
+            <if test="smspu.productName != null and smspu.productName != ''">
+               and esp.product_name like concat('%', #{supermarketSpuQueryDTO.productName}, '%')
+            </if>
+        </where>
+    </select>
 </mapper>