溢出门店列表

gic-store-api/src/main/java/com/gic/store/service/StoreApiService.java

@@ -36,4 +36,6 @@ public interface StoreApiService {
      */
     ServiceResponse<Integer> costStoreMove(String storeIds, String toStoreId);
 
+    ServiceResponse<Page<StoreDTO>> listStoreOverFlow(Integer enterpriseId, Page<StoreDTO> page, String search);
+
 }

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreMapper.java

@@ -70,4 +70,6 @@ public interface TabStoreMapper {
     Page listStore(StoreDTO storeDTO);
 
     List<TabStore> listStoreByRegionAndStatus(@Param("regionIdList") List<Integer> regionIdList,@Param("statusList") List<Integer> statusList);
+
+    List<StoreDTO> listStoreOverFlow(@Param("enterpriseId") Integer enterpriseId, @Param("search") String search);
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/service/StoreService.java

@@ -66,4 +66,6 @@ public interface StoreService {
 
     int updateStoreGroupId(Integer storeId, Integer groupId);
 
+    Page listStoreOverFlow(Integer enterpriseId, Integer pageNum, Integer pageSize, String search);
+
 }

gic-store-service/src/main/java/com/gic/store/service/impl/StoreServiceImpl.java

@@ -158,4 +158,10 @@ public class StoreServiceImpl implements StoreService {
         store.setStoreGroupId(groupId);
         return tabStoreMapper.updateByPrimaryKeySelective(store);
     }
+
+    @Override
+    public Page listStoreOverFlow(Integer enterpriseId, Integer pageNum, Integer pageSize, String search) {
+        PageHelper.startPage(pageNum, pageSize);
+        return (Page<StoreDTO>)tabStoreMapper.listStoreOverFlow(enterpriseId, search);
+    }
 }

gic-store-service/src/main/java/com/gic/store/service/outer/StoreApiServiceImpl.java

@@ -222,4 +222,12 @@ public class StoreApiServiceImpl implements StoreApiService {
     public ServiceResponse<Integer> costStoreMove(String storeIds, String toStoreId) {
         return null;
     }
+
+    @Override
+    public ServiceResponse<Page<StoreDTO>> listStoreOverFlow(Integer enterpriseId, Page<StoreDTO> page, String search) {
+        com.github.pagehelper.Page<StoreDTO> p = this.storeService.listStoreOverFlow(enterpriseId, page.getCurrentPage(),
+                page.getPageSize(), search);
+        page = PageHelperUtils.changePageHelperToCurrentPage(p, StoreDTO.class);
+        return ServiceResponse.success(page);
+    }
 }

gic-store-service/src/main/resources/mapper/TabStoreMapper.xml

@@ -352,4 +352,14 @@
       #{status}
     </foreach>
   </select>
+  <select id="listStoreOverFlow" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_store
+    where enterprise_id=#{enterpriseId}
+    and overflow_status=1
+    <if test="search != null and search !='' ">
+      and (store_name like concat('%', #{search}, '%') or store_code like concat('%', #{search}, '%'))
+    </if>
+  </select>
 </mapper>
\ No newline at end of file

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -19,6 +19,7 @@ import com.gic.store.web.qo.PageQO;
 import com.gic.store.web.qo.store.StoreQO;
 import com.gic.store.web.vo.StoreDictVO;
 import com.gic.store.web.vo.StoreListSourceVO;
+import com.gic.store.web.vo.StoreOverflowVO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -128,6 +129,23 @@ public class StoreController {
         return RestResponse.success();
     }
 
+    @RequestMapping("list-store-overflow")
+    public RestResponse listStoreOverFlow(String search, PageQO pageQO){
+        Integer enterpriseId = 1111;
+        Page<StoreDTO> page = new Page<>(pageQO.getCurrentPage(), pageQO.getPageSize());
+        ServiceResponse<Page<StoreDTO>> response = this.storeApiService.listStoreOverFlow(enterpriseId, page, search);
+        if(response.isSuccess()){
+            page = response.getResult();
+            Page<StoreOverflowVO> page1 = new Page<>();
+            page1.setTotalCount(page.getTotalCount());
+            page1.setCurrentPage(page.getCurrentPage());
+            page1.setPageSize(page.getPageSize());
+            page1.setResult(EntityUtil.changeEntityListByJSON(StoreOverflowVO.class, page.getResult()));
+            return RestResponse.success(page1);
+        }
+        return EnterpriseRestResponse.failure(response);
+    }
+
     @RequestMapping("list-store-log")
     public RestResponse listStoreLog(Integer storeId, PageQO pageQO){
         Page page = new Page(pageQO.getCurrentPage(), pageQO.getPageSize());

gic-store-web/src/main/java/com/gic/store/web/vo/StoreOverflowVO.java

+package com.gic.store.web.vo;
+
+import com.gic.store.dto.StoreBrandDTO;
+import com.gic.store.dto.StoreBusinessTimeDTO;
+import com.gic.store.dto.StoreExtendDTO;
+import com.gic.store.dto.StorePhotoDTO;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zhiwj
+ * @date 2019/6/24
+ */
+public class StoreOverflowVO implements Serializable {
+    private static final long serialVersionUID = -6360038263126373120L;
+    /**
+     *
+     */
+    private Integer storeId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 门店名称
+     */
+    private String storeName;
+
+    /**
+     * 门店code
+     */
+    private String storeCode;
+
+    /**
+     * 门店详细地址
+     */
+    private String address;
+
+
+    /**
+     * 门店启用状态；1启用  2不启用
+     */
+    private Integer status;
+
+    private Integer completeStatus;
+
+    private String storeGroupName;
+    private String provinces;
+
+
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public void setStoreGroupName(String storeGroupName) {
+        this.storeGroupName = storeGroupName;
+    }
+
+    public String getStoreGroupName() {
+        return storeGroupName;
+    }
+
+    public String getProvinces() {
+        return provinces;
+    }
+
+    public void setProvinces(String provinces) {
+        this.provinces = provinces;
+    }
+
+    public Integer getCompleteStatus() {
+        return completeStatus;
+    }
+
+    public void setCompleteStatus(Integer completeStatus) {
+        this.completeStatus = completeStatus;
+    }
+}