门店查看库存接口

sailun-allsteel-app-rest/src/main/java/io/platform/app/web/controller/HomePageController.java

@@ -1,12 +1,17 @@
 package io.platform.app.web.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.platform.app.web.remote.HomePageRemote;
 import io.platform.base.common.exception.RRException;
 import io.platform.base.common.utils.R;
 import io.platform.base.dto.ArticleDTO;
 import io.platform.base.dto.NoticeDTO;
 import io.platform.base.dto.StoreBannerDTO;
+import io.platform.base.dto.StoreStockQuery;
+import io.platform.base.vo.StoreBrandVO;
 import io.platform.config.annotation.FuncLogAnno;
+import io.platform.store.dto.StoreAgentBrandLvLogDto;
+import io.platform.store.dto.StoreStockDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -14,6 +19,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * TODO
  *
@@ -57,7 +64,7 @@ public class HomePageController {
      * @return
      */
     @PostMapping("/noticeList")
-    @ApiOperation("首页公告消息")
+    @ApiOperation("首页公告消息接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "contentType", value = "展示位置",required = true),
     })
@@ -76,7 +83,7 @@ public class HomePageController {
      * @return
      */
     @PostMapping("/articleList")
-    @ApiOperation("系统政策")
+    @ApiOperation("系统政策接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "displayType", value = "展示位置",required = true),
     })
@@ -89,6 +96,50 @@ public class HomePageController {
     }
 
 
+    /**
+     * 获取门店库存
+     * 1.
+     * @param storeStockQuery
+     * @return
+     */
+    @PostMapping("/getStoreStock")
+    @ApiOperation("门店查看库存接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "storeId", value = "门店id",required = true),
+            @ApiImplicitParam(name = "current", value = "页码数",required = true),
+            @ApiImplicitParam(name = "size", value = "每页多少条",required = true),
+            @ApiImplicitParam(name = "brandCode", value = "品牌code",required = false),
+            @ApiImplicitParam(name = "specKey", value = "关键字",required = false)
+    })
+    public R getStoreStock(@RequestBody StoreStockQuery storeStockQuery) {
+        if (null == storeStockQuery.getStoreId()) {
+            throw new RRException("门店ID不能为空");
+        }
+        if (null == storeStockQuery.getCurrent()) {
+            throw new RRException("页码数不能为空");
+        }if (null == storeStockQuery.getSize()) {
+            throw new RRException("条数不能为空");
+        }
+        Page<StoreStockDto> storeStock = this.homePageRemote.getStoreStock(storeStockQuery);
+        List<StoreBrandVO> brandList = this.homePageRemote.getStoreBrandList(storeStockQuery);
+        return R.ok().put("storeStock",storeStock).put("brandList",brandList);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
-}
+}

sailun-allsteel-app-rest/src/main/java/io/platform/app/web/remote/HomePageRemote.java

@@ -1,19 +1,23 @@
 package io.platform.app.web.remote;
 
+
 import com.alibaba.dubbo.config.annotation.Reference;
-import io.platform.base.common.exception.RRException;
 import io.platform.base.dto.ArticleDTO;
 import io.platform.base.dto.NoticeDTO;
 import io.platform.base.dto.StoreBannerDTO;
+import io.platform.base.dto.StoreStockQuery;
+import io.platform.base.vo.StoreBrandVO;
 import io.platform.homepage.dto.ConfigArticleDto;
 import io.platform.homepage.dto.ConfigBannerDto;
 import io.platform.homepage.dto.ConfigNoticeDto;
-import io.platform.app.web.query.CommonQuery;
 import io.platform.homepage.service.client.api.ConfigArticleServiceClient;
 import io.platform.homepage.service.client.api.ConfigBannerServiceClient;
 import io.platform.homepage.service.client.api.ConfigNoticeServiceClient;
+import io.platform.store.dto.StoreStockDto;
+import io.platform.store.service.client.api.StoreAgentBrandLvLogServiceClient;
+import io.platform.store.service.client.api.StoreStockServiceClient;
 import org.springframework.stereotype.Service;
-
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.List;
 
 @Service("homePageRemote")
@@ -28,6 +32,13 @@ public class HomePageRemote {
     @Reference(check = false)
     private ConfigArticleServiceClient configArticleServiceClient;
 
+    @Reference(check = false)
+    private StoreStockServiceClient storeStockServiceClient;
+
+
+    @Reference(check = false)
+    private StoreAgentBrandLvLogServiceClient storeAgentBrandLvLogServiceClient;
+
     /**
      * 轮播图
      * @param storeBannerDTO
@@ -55,4 +66,21 @@ public class HomePageRemote {
         return configArticleServiceClient.getArticle(articleDTO);
     }
 
+    /**
+     * 根据门店获取库存
+     * @param storeStockQuery
+     * @return
+     */
+    public Page<StoreStockDto> getStoreStock(StoreStockQuery storeStockQuery) {
+        return this.storeStockServiceClient.getStoreStock(storeStockQuery);
+    }
+
+    /**
+     * 门店经营品牌列表
+     * @param storeStockQuery
+     * @return
+     */
+    public List<StoreBrandVO> getStoreBrandList(StoreStockQuery storeStockQuery) {
+        return storeAgentBrandLvLogServiceClient.getStoreBrandList(storeStockQuery.getStoreId());
+    }
 }

sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/store/dto/StoreStockDto.java

@@ -30,7 +30,7 @@ private static final long serialVersionUID = 5454155825314635342L;
     /**
      * 品牌       db_column: BRAND
      */
-    private String brand;
+    private String brandCode;
     /**
      * 规格       db_column: SPEC
      */
@@ -53,4 +53,13 @@ private static final long serialVersionUID = 5454155825314635342L;
     private java.util.Date updateTime;
     //columns END
 
+
+    /**
+     * 展示用的规格信息
+     * 品牌 + 物料
+     *
+     *
+     */
+    private  String showSpec;
+
 }

sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/store/service/client/api/StoreAgentBrandLvLogServiceClient.java

@@ -2,6 +2,8 @@
 package io.platform.store.service.client.api;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.platform.base.dto.StoreStockQuery;
+import io.platform.base.vo.StoreBrandVO;
 import io.platform.store.dto.StoreAgentBrandLvLogDto;
 
 import java.util.List;
@@ -42,4 +44,12 @@ public interface StoreAgentBrandLvLogServiceClient{
          * 根据分页参数 获取 分页集合
          */
         Page<StoreAgentBrandLvLogDto>getPage(Page<StoreAgentBrandLvLogDto>page,StoreAgentBrandLvLogDto storeAgentBrandLvLogDto);
+
+        /**
+         *
+         * 根据门店id查看门店经营品牌
+         * @param storeId
+         * @return
+         */
+        List<StoreBrandVO> getStoreBrandList(Long storeId);
 }

sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/store/service/client/api/StoreStockServiceClient.java

@@ -2,6 +2,7 @@
 package io.platform.store.service.client.api;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.platform.base.dto.StoreStockQuery;
 import io.platform.store.dto.StoreStockDto;
 
 import java.util.List;
@@ -38,16 +39,17 @@ public interface StoreStockServiceClient{
          * 根据主键集合 批量删除
          */
         ExecuteResult<String> deleteBatch(List<Long> idList);
+
         /**
-         * 根据分页参数 获取 分页集合
-         */
+        * 根据分页参数 获取 分页集合
+        */
         Page<StoreStockDto>getPage(Page<StoreStockDto>page,StoreStockDto storeStockDto);
 
 
-
-
-
-
-
-
+        /**
+         * 根据门店id获取门店库存
+         * @param storeStockQuery
+         * @return
+         */
+        Page<StoreStockDto> getStoreStock(StoreStockQuery storeStockQuery);
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/pom.xml

@@ -134,6 +134,12 @@
             <artifactId>javase</artifactId>
             <version>3.3.3</version>
         </dependency>
+        <!--分页助手-->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.2.5</version>
+        </dependency>
     </dependencies>
 
 

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/homepage/service/client/impl/ConfigBannerServiceClientImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.platform.base.common.BaseServiceClient;
 import io.platform.base.common.utils.ExecuteResult;
 
+import io.platform.base.dto.StoreBannerDTO;
 import io.platform.homepage.biz.entity.ConfigBanner;
 import io.platform.homepage.biz.service.ConfigBannerService;
 import io.platform.homepage.dto.ConfigBannerDto;
@@ -145,8 +146,11 @@ public class ConfigBannerServiceClientImpl extends BaseServiceClient<ConfigBanne
     }
 
     @Override
-    public List<ConfigBannerDto> getStoreBannerList(Long storeId) {
+    public List<ConfigBannerDto> getStoreBannerList(StoreBannerDTO storeBannerDTO) {
+        Long storeId = storeBannerDTO.getStoreId();
         List<ConfigBannerDto> bannerList = configBannerService.getBannerList(storeId);
         return bannerList;
     }
+
+
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/store/biz/entity/StoreStock.java

@@ -53,8 +53,8 @@ public class StoreStock extends Model<StoreStock>  implements Serializable{
     /**
      * 品牌       db_column: BRAND
      */
-    @TableField("BRAND")
-    private String brand;
+    @TableField("BRAND_CODE")
+    private String brandCode;
 
     /**
      * 规格       db_column: SPEC

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/store/biz/mapper/StoreAgentBrandLvLogMapper.java

@@ -1,8 +1,12 @@
 package io.platform.store.biz.mapper;
 
 import io.platform.base.common.BaseMapper;
+import io.platform.base.vo.StoreBrandVO;
 import org.apache.ibatis.annotations.Mapper;
 import io.platform.store.biz.entity.StoreAgentBrandLvLog;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 
 /**
@@ -11,4 +15,5 @@ import io.platform.store.biz.entity.StoreAgentBrandLvLog;
 @Mapper
 public interface StoreAgentBrandLvLogMapper extends BaseMapper<StoreAgentBrandLvLog>{
 
+    List<StoreBrandVO> getStoreBrandList(@Param("storeId") Long storeId);
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/store/biz/mapper/StoreStockMapper.java

@@ -1,10 +1,14 @@
 package io.platform.store.biz.mapper;
 
 import io.platform.base.common.BaseMapper;
+import io.platform.base.dto.StoreStockQuery;
+import io.platform.store.dto.StoreStockDto;
 import org.apache.ibatis.annotations.Mapper;
 import io.platform.store.biz.entity.StoreStock;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
  * Created by sevelli on 2017/9/6.
@@ -13,4 +17,7 @@ import org.apache.ibatis.annotations.Param;
 public interface StoreStockMapper extends BaseMapper<StoreStock>{
 
 
+    Long getStoreStockTotal(@Param("storeStockQuery") StoreStockQuery storeStockQuery);
+
+    List<StoreStockDto> getStoreStock(@Param("storeStockQuery")StoreStockQuery storeStockQuery);
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/store/biz/service/StoreAgentBrandLvLogService.java

@@ -3,6 +3,7 @@ package io.platform.store.biz.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import io.platform.base.vo.StoreBrandVO;
 import io.platform.store.biz.mapper.StoreAgentBrandLvLogMapper;
 import io.platform.store.biz.entity.StoreAgentBrandLvLog;
 
@@ -18,4 +19,12 @@ public class StoreAgentBrandLvLogService extends ServiceImpl<StoreAgentBrandLvLo
         return baseMapper.selectByMap(map);
     }
 
+    /**
+     * 根据门店id获取门店经营品牌
+     * @param storeId
+     * @return
+     */
+    public List<StoreBrandVO> getStoreBrandList(Long storeId) {
+        return this.baseMapper.getStoreBrandList(storeId);
+    }
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/store/biz/service/StoreStockService.java

@@ -3,9 +3,11 @@ package io.platform.store.biz.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import io.platform.base.dto.StoreStockQuery;
 import io.platform.store.biz.mapper.StoreStockMapper;
 import io.platform.store.biz.entity.StoreStock;
 
+import io.platform.store.dto.StoreStockDto;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -19,4 +21,21 @@ public class StoreStockService extends ServiceImpl<StoreStockMapper,StoreStock>{
     }
 
 
+    /**
+     * 门店库存条数
+     * @param storeStockQuery
+     * @return
+     */
+    public Long getStoreStockTotal(StoreStockQuery storeStockQuery) {
+        return this.baseMapper.getStoreStockTotal(storeStockQuery);
+    }
+
+    /**
+     * 查询门店库存
+     * @param storeStockQuery
+     * @return
+     */
+    public List<StoreStockDto> getStoreStock(StoreStockQuery storeStockQuery) {
+        return this.baseMapper.getStoreStock(storeStockQuery);
+    }
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/store/service/client/impl/StoreAgentBrandLvLogServiceClientImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.platform.base.common.BaseServiceClient;
 import io.platform.base.common.utils.ExecuteResult;
 
+import io.platform.base.vo.StoreBrandVO;
 import io.platform.store.biz.entity.StoreAgentBrandLvLog;
 import io.platform.store.biz.service.StoreAgentBrandLvLogService;
 import io.platform.store.dto.StoreAgentBrandLvLogDto;
@@ -142,4 +143,14 @@ public class StoreAgentBrandLvLogServiceClientImpl extends BaseServiceClient<Sto
         pageDto.setRecords(storeAgentBrandLvLogDtoList);
         return pageDto;
     }
+
+    /**
+     * 根据门店id查询门店经营品牌
+     * @param storeId
+     * @return
+     */
+    @Override
+    public List<StoreBrandVO> getStoreBrandList(Long storeId) {
+        return this.storeAgentBrandLvLogService.getStoreBrandList(storeId);
+    }
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/store/service/client/impl/StoreStockServiceClientImpl.java

@@ -5,9 +5,11 @@ import com.alibaba.dubbo.config.annotation.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
+import com.github.pagehelper.PageHelper;
 import io.platform.base.common.BaseServiceClient;
 import io.platform.base.common.utils.ExecuteResult;
 
+import io.platform.base.dto.StoreStockQuery;
 import io.platform.store.biz.entity.StoreStock;
 import io.platform.store.biz.service.StoreStockService;
 import io.platform.store.dto.StoreStockDto;
@@ -127,10 +129,6 @@ public class StoreStockServiceClientImpl extends BaseServiceClient<StoreStock,St
     public Page<StoreStockDto> getPage(Page<StoreStockDto> pageDto,StoreStockDto storeStockDto) {
         Page<StoreStock> page = new Page<>(pageDto.getCurrent(),pageDto.getSize());
 
-        page.setAsc(pageDto.ascs());
-        page.setDesc(pageDto.descs());
-        page.condition().putAll(pageDto.condition());
-
         StoreStock storeStock = new StoreStock();
         revert(storeStockDto,storeStock);
 
@@ -144,4 +142,22 @@ public class StoreStockServiceClientImpl extends BaseServiceClient<StoreStock,St
     }
 
 
+    /**
+     * 根据门店获取门店库存
+     * @param storeStockQuery
+     * @return
+     */
+    @Override
+    public Page<StoreStockDto> getStoreStock(StoreStockQuery storeStockQuery) {
+        Page<StoreStockDto> page = new Page<>();
+        PageHelper.startPage(storeStockQuery.getCurrent(),storeStockQuery.getSize());
+        // 条数
+        page.setTotal(this.storeStockService.getStoreStockTotal(storeStockQuery));
+
+        // 内容
+        page.setRecords(this.storeStockService.getStoreStock(storeStockQuery));
+        return page;
+    }
+
+
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/resources/application-dev.yml

@@ -65,6 +65,12 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+
+#pagehelper
+pagehelper:
+  helper-dialect: oracle
+
 #logging
 logging:
   org.springframework.web: info

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/resources/mybatis/store/StoreAgentBrandLvLogMapper.xml

@@ -4,5 +4,9 @@
 <mapper namespace="io.platform.store.biz.mapper.StoreAgentBrandLvLogMapper">
 
 
+    <select id="getStoreBrandList" parameterType="long" resultMap="io.platform.base.vo.StoreBrandVO">
+        SELECT BRAND_CODE brandCode,BEAND brandName FROM APP_STORE_AGENT_BRAND_LV WHERE #{storeId}
+    </select>
+
 
 </mapper>

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/resources/mybatis/store/StoreStockMapper.xml

@@ -4,5 +4,63 @@
 <mapper namespace="io.platform.store.biz.mapper.StoreStockMapper">
 
 
+    <resultMap id="storeStocktMap" type="io.platform.base.dto.StoreStockQuery">
+        <result column="STORE_ID" property="storeId"/>
+        <result column="MATNR" property="matnr"/>
+        <result column="MAKTX" property="maktx"/>
+        <result column="TATAL_STOCK" property="tatalStock"/>
+        <result column="BRAND_CODE" property="brandCode"/>
+        <result column="SPEC" property="spec"/>
+        <result column="PATTERN" property="pattern"/>
+        <result column="showSpec" property="showSpec"/>
+    </resultMap>
+
+
+
+
+
+
+
+    <!-- 查询门店库存记录条数 -->
+    <select id="getStoreStockTotal" resultType="Long" parameterType="io.platform.base.dto.StoreStockQuery">
+        SELECT COUNT(*) FROM APP_STORE_STOCK
+        <where>
+            STORE_ID = #{storeStockQuery.storeId}
+            <if test=" ''! = storeStockQuery.brandCode and null != storeStockQuery.brandCode ">
+                and BRAND_CODE = #{storeStockQuery.brandCode}
+            </if>
+            <if test=" ''! = storeStockQuery.specKey and null != storeStockQuery.specKey ">
+
+                and SPEC_KEY = #{storeStockQuery.specKey}
+            </if>
+        </where>
+    </select>
+
+
+    <select id="getStoreStock" parameterType="io.platform.store.dto.StoreStockDto" resultMap="storeStocktMap">
+        SELECT
+            MATNR,
+            MAKTX,
+            TATAL_STOCK,
+            BRAND_CODE,
+            SPEC,
+            PATTERN,
+            (BRAND_CODE || '  ' || MAKTX)  showSpec
+        FROM
+            APP_STORE_STOCK
+        <where>
+            STORE_ID = #{storeStockQuery.storeId}
+            <if test=" ''! = storeStockQuery.brandCode and null != storeStockQuery.brandCode ">
+                and BRAND_CODE = #{storeStockQuery.brandCode}
+            </if>
+            <if test=" ''! = storeStockQuery.specKey and null != storeStockQuery.specKey ">
+                and SPEC_KEY = #{storeStockQuery.specKey}
+            </if>
+        </where>
+    </select>
+
+
+
+
 
 </mapper>

sailun-allsteel-common/pom.xml

@@ -127,6 +127,12 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

sailun-allsteel-common/src/main/java/io/platform/base/dto/StoreStockQuery.java

@@ -0,0 +1,51 @@
+package io.platform.base.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * TODO
+ *
+ * @author shanxin
+ * @version 1.0
+ * @date 2020/11/6 11:37
+ */
+@Data
+public class StoreStockQuery implements Serializable {
+
+    private static final long serialVersionUID = 5454155825314635342L;
+
+
+    /**
+     * 门店id
+     */
+    private Long storeId;
+
+    /**
+     * 品牌code
+     */
+    private String brandCode;
+
+
+    /**
+     * 规格关键字
+     */
+    private String specKey;
+
+    /**
+     * 页码数
+     */
+    private Integer current;
+
+
+    /**
+     * 每页大小
+     */
+    private Integer size;
+
+
+
+
+
+}

sailun-allsteel-common/src/main/java/io/platform/base/vo/StoreBrandVO.java

@@ -0,0 +1,29 @@
+package io.platform.base.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * TODO
+ *
+ * 门店品牌
+ * 视图展示内容
+ * @author shanxin
+ * @version 1.0
+ * @date 2020/11/6 15:24
+ */
+@Data
+public class StoreBrandVO implements Serializable {
+
+    private static final long serialVersionUID = 5454155825314635342L;
+
+
+
+    private String brandCode;
+
+    private String brandName;
+
+
+
+}