Browse Source

医健宝-商品关联审核状态开关

chenguo 1 day ago
parent
commit
9844002113

+ 1 - 1
fs-admin/src/main/java/com/fs/hisStore/FsStoreSCRMController.java

@@ -84,7 +84,7 @@ public class FsStoreSCRMController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FsStoreScrm fsStore)
     {
-        return toAjax(fsStoreService.insertFsStore(fsStore));
+        return AjaxResult.success(fsStoreService.insertFsStore(fsStore));
     }
 
     /**

+ 37 - 0
fs-service/src/main/java/com/fs/hisStore/config/MedicalMallConfig.java

@@ -0,0 +1,37 @@
+package com.fs.hisStore.config;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fs.his.utils.ConfigUtil;
+import lombok.Getter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+@Getter
+@Component
+public class MedicalMallConfig {
+
+    @Autowired
+    private ConfigUtil configUtil;
+    /*
+    {"isMedicalMall":"0","statics":"1","isAudit":"0"}
+    */
+    // 是否药品商城
+    private String isMedicalMall;
+    // 首页是否根据部门、公司进行统计
+    private String statics;
+    // 店铺、商品是否审核
+    private String isAudit;
+    @PostConstruct
+    public void init() {
+        JSONObject jsonObject = configUtil.generateConfigByKey("medicalMall.func.switch");
+        if (jsonObject != null) {
+            this.isMedicalMall = jsonObject.getString("isMedicalMall");
+            this.statics = jsonObject.getString("statics");
+            this.isAudit = jsonObject.getString("isAudit");
+        }
+    }
+
+
+}

+ 15 - 5
fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreCartScrmMapper.java

@@ -1,6 +1,8 @@
 package com.fs.hisStore.mapper;
 
 import java.util.List;
+
+import com.fs.hisStore.config.MedicalMallConfig;
 import com.fs.hisStore.domain.FsStoreCartScrm;
 import com.fs.hisStore.param.FsStoreCartCountParam;
 import com.fs.hisStore.vo.FsStoreCartQueryVO;
@@ -66,16 +68,24 @@ public interface FsStoreCartScrmMapper
      */
     public int deleteFsStoreCartByIds(Long[] ids);
 
-    @Select("select c.*,p.product_type,p.product_name,p.image as product_image," +
+    @Select({"<script>"+
+            "select c.*,p.product_type,p.product_name,p.image as product_image," +
             "v.price,v.sku as product_attr_name,v.image as product_attr_image,v.stock " +
             "from fs_store_cart_scrm c " +
             "inner join fs_store_product_scrm p on p.product_id=c.product_id " +
-            "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
+            "inner join fs_store_scrm fs on fs.store_id = p.store_id " +
+            "<if test='config.isAudit == \"1\"'>" +
+            "and fs.is_audit = 1 " +
+            "</if>" +
             "inner join fs_store_product_attr_value_scrm v on v.id=c.product_attr_value_id " +
             "where c.is_pay=0 and c.is_del=0 and c.is_buy=0 " +
-            "and p.is_del=0 and p.is_show=1  and p.is_audit = '1'" +
-            "and c.user_id= #{uid}")
-    List<FsStoreCartVO> selectFsStoreCartListByUid(long uid);
+            "and p.is_del=0 and p.is_show=1 " +
+            "<if test='config.isAudit == \"1\"'>" +
+            "and p.is_audit = '1' " +
+            "</if>" +
+            "and c.user_id= #{uid} " +
+            "</script>"})
+    List<FsStoreCartVO> selectFsStoreCartListByUid(long uid,@Param("config") MedicalMallConfig config);
     @Delete({"<script>"+
             "delete from fs_store_cart_scrm where id in"+
            "<foreach collection='array' item='id' open='(' separator=',' close=')'>#{id}</foreach>"+

+ 7 - 2
fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductAttrValueScrmMapper.java

@@ -1,6 +1,8 @@
 package com.fs.hisStore.mapper;
 
 import java.util.List;
+
+import com.fs.hisStore.config.MedicalMallConfig;
 import com.fs.hisStore.domain.FsStoreProductAttrValueScrm;
 import com.fs.hisStore.param.FsProductAttrValueParam;
 import com.fs.hisStore.param.FsStoreProductAttrValueQueryParam;
@@ -115,7 +117,10 @@ public interface FsStoreProductAttrValueScrmMapper
     @Select({"<script> " +
             "select v.*,p.product_name from fs_store_product_attr_value_scrm v " +
             "inner join fs_store_product_scrm p on p.product_id=v.product_id    " +
-            "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
+            "inner join fs_store_scrm fs on fs.store_id = p.store_id " +
+            "<if test='config.isAudit == \"1\" '>" +
+            "and fs.is_audit = 1 " +
+            "</if>" +
             "where p.is_show=1 and p.is_display=1 and (v.brokerage &gt;0 || v.brokerage_two &gt;0) " +
             "<if test = 'maps.productName != null and  maps.productName !=\"\"    '> " +
             "and p.product_name like CONCAT('%',#{maps.productName},'%') " +
@@ -125,7 +130,7 @@ public interface FsStoreProductAttrValueScrmMapper
             "</if>" +
             " order by v.id desc "+
             "</script>"})
-    List<FsStoreProductAttrValueQueryVO> selectStoreProductAttrValueListQuery(@Param("maps")FsStoreProductAttrValueQueryParam param);
+    List<FsStoreProductAttrValueQueryVO> selectStoreProductAttrValueListQuery(@Param("maps")FsStoreProductAttrValueQueryParam param,@Param("config") MedicalMallConfig config);
 
     @Select({"<script> " +
             "select v.*,p.tui_cate_id,p.product_name from fs_store_product_attr_value_scrm v inner join fs_store_product_scrm p on p.product_id=v.product_id    " +

+ 58 - 16
fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductScrmMapper.java

@@ -2,11 +2,10 @@ package com.fs.hisStore.mapper;
 
 import java.util.List;
 
-import com.fs.common.annotation.Log;
-import com.fs.common.enums.BusinessType;
 import com.fs.his.param.FsStoreProductListSParam;
 import com.fs.his.vo.FsStoreProductListSVO;
 import com.fs.his.vo.OptionsVO;
+import com.fs.hisStore.config.MedicalMallConfig;
 import com.fs.hisStore.domain.FsStoreProductRuleScrm;
 import com.fs.statis.dto.ModifyMoreDTO;
 import com.fs.hisStore.domain.FsStoreProductScrm;
@@ -220,11 +219,16 @@ public interface FsStoreProductScrmMapper
     @Select({"<script> " +
             "select p.* from fs_store_product_scrm p  " +
             //新增审核状态及所属店铺审核状态
+            "<if test='config.isAudit == \"1\" '>" +
             "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
-            "where p.is_del=0 and p.is_show=1  and p.is_audit = '1'" +
+            "</if>" +
+            "where p.is_del=0 and p.is_show=1  " +
+            "<if test='config.isAudit == \"1\" '>" +
+            "and p.is_audit = '1'" +
+            "</if>" +
             "and p.product_id=#{productId} " +
             "</script>"})
-    FsStoreProductQueryVO selectFsStoreProductByIdQuery(Long productId);
+    FsStoreProductQueryVO selectFsStoreProductByIdQuery(Long productId, String storeId,@Param("config") MedicalMallConfig config);
     @Update("update fs_store_product_scrm set stock=stock-#{num}, sales=sales+#{num}" +
             " where product_id=#{productId} and stock >= #{num}")
     int decProductAttrStock(@Param("productId")Long productId, @Param("num")Integer cartNum);
@@ -232,28 +236,63 @@ public interface FsStoreProductScrmMapper
             " where product_id=#{productId}")
     int incStockDecSales( @Param("num")Long num, @Param("productId")Long productId);
     @Select("select p.* from fs_store_product_scrm p " +
+            //新增审核状态及所属店铺审核状态
+            "<if test='config.isAudit == \"1\" '>" +
             "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
-            "where p.is_del=0 and p.is_show=1 and p.is_audit = '1'  and  p.is_new=1 and p.is_display=1 order by p.sort desc limit #{count}")
-    List<FsStoreProductListQueryVO> selectFsStoreProductNewQuery(int count);
+            "</if>" +
+            "where p.is_del=0 and p.is_show=1 " +
+            "<if test='config.isAudit == \"1\" '>" +
+            "and p.is_audit = '1'  " +
+            "</if>" +
+            "and  p.is_new=1 and p.is_display=1 order by p.sort desc limit #{count}")
+    List<FsStoreProductListQueryVO> selectFsStoreProductNewQuery(int count,@Param("config") MedicalMallConfig  config);
     @Select("select p.* from fs_store_product_scrm p " +
+            //新增审核状态及所属店铺审核状态
+            "<if test='config.isAudit == \"1\" '>" +
             "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
-            "where p.is_del=0 and p.is_show=1 and p.is_audit = '1'  and  p.is_hot=1 and p.is_display=1 order by p.sort desc limit #{count}")
-    List<FsStoreProductListQueryVO> selectFsStoreProductHotQuery(int count);
+            "</if>" +
+            "where p.is_del=0 and p.is_show=1 " +
+            "<if test='config.isAudit == \"1\" '>" +
+            "and p.is_audit = '1'" +
+            "</if>" +
+            "and  p.is_hot=1 and p.is_display=1 order by p.sort desc limit #{count}")
+    List<FsStoreProductListQueryVO> selectFsStoreProductHotQuery(int count,@Param("config") MedicalMallConfig  config);
     @Select("select p.* from fs_store_product_scrm p " +
+            //新增审核状态及所属店铺审核状态
+            "<if test='config.isAudit == \"1\" '>" +
             "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
-            "where p.is_del=0 and p.is_show=1 and p.is_audit = '1' and  p.is_good=1 and p.is_display=1 order by p.sort desc limit #{count}")
-    List<FsStoreProductListQueryVO> selectFsStoreProductGoodQuery(int count);
+            "</if>" +
+            "where p.is_del=0 and p.is_show=1 " +
+            "<if test='config.isAudit == \"1\" '>" +
+            "and p.is_audit = '1'" +
+            "</if>" +
+            "and  p.is_good=1 and p.is_display=1 order by p.sort desc limit #{count}")
+    List<FsStoreProductListQueryVO> selectFsStoreProductGoodQuery(int count,@Param("config") MedicalMallConfig  config);
     @Select("SELECT COUNT(*) OVER (PARTITION BY fsp.product_name) AS storeCount,p1.storeIds,fsp.* " +
             "FROM fs_store_product_scrm fsp " +
             "left join (select GROUP_CONCAT(distinct fsp1.store_id SEPARATOR ',' ) AS storeIds,fsp1.product_name " +
             "from  fs_store_product_scrm fsp1 group by fsp1.product_name) p1 on p1.product_name = fsp.product_name "+
-            "inner join fs_store_scrm fs on fs.store_id = fsp.store_id and fs.is_audit = 1 " +
-            "where fsp.is_del=0 and fsp.is_show=1 and fsp.is_audit = '1' and fsp.is_best=1 and fsp.is_display=1 order by fsp.sort desc,fsp.product_id desc")
-    List<FsStoreProductListQueryVO> selectFsStoreProductTuiListQuery();
+            "inner join fs_store_scrm fs on fs.store_id = fsp.store_id " +
+            "<if test='config.isAudit == \"1\" '>" +
+            "and fs.is_audit = '1'" +
+            "</if>" +
+            "where fsp.is_del=0 and fsp.is_show=1 " +
+            "<if test='config.isAudit == \"1\" '>" +
+            "and fsp.is_audit = '1'" +
+            "</if>" +
+            "and fsp.is_best=1 and fsp.is_display=1 order by fsp.sort desc,fsp.product_id desc")
+    List<FsStoreProductListQueryVO> selectFsStoreProductTuiListQuery(@Param("config") MedicalMallConfig  config);
     @Select("select p.* from fs_store_product_scrm p " +
+            //新增审核状态及所属店铺审核状态
+            "<if test='config.isAudit == \"1\" '>" +
             "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
-            "where p.is_del=0 and p.is_show=1 and p.is_audit = '1'  and  p.is_good=1 and p.is_display=1 order by p.sort desc")
-    List<FsStoreProductListQueryVO> selectFsStoreProductGoodListQuery();
+            "</if>" +
+            "where p.is_del=0 and p.is_show=1 " +
+            "<if test='config.isAudit == \"1\" '>" +
+            "and p.is_audit = '1'" +
+            "</if>" +
+            "and  p.is_good=1 and p.is_display=1 order by p.sort desc")
+    List<FsStoreProductListQueryVO> selectFsStoreProductGoodListQuery(@Param("config") MedicalMallConfig  config);
     @Select({"<script> " +
             "select count(1) from fs_store_product_scrm  " +
             "where 1=1 " +
@@ -358,8 +397,11 @@ public interface FsStoreProductScrmMapper
 
     @Select({"<script> " +
             "select p.* from fs_store_product_scrm p " +
+            //新增审核状态及所属店铺审核状态
+            "<if test='config.isAudit == \"1\" '>" +
             "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
+            "</if>" +
             "where find_in_set(p.product_id,#{ids})  " +
             "</script>"})
-    List<FsStoreProductActivityListVO> selectFsStoreProductByIdsAudit(String productIds);
+    List<FsStoreProductActivityListVO> selectFsStoreProductByIdsAudit(String productIds,@Param("config") MedicalMallConfig  config);
 }

+ 5 - 0
fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreScrmMapper.java

@@ -2,6 +2,7 @@ package com.fs.hisStore.mapper;
 
 import com.fs.hisStore.domain.FsStoreScrm;
 import com.fs.hisStore.vo.FsStoreRecommendListVO;
+import com.fs.hisStore.vo.FsStoreScrmVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
@@ -83,4 +84,8 @@ public interface FsStoreScrmMapper
     List<FsStoreScrm> selectFsStoreByStoreIds(String[] storeId);
 
     List<FsStoreScrm> selectFsStoreListByProduct(FsStoreScrm fsStoreScrm);
+
+//    @Select("select store_id ,store_name,bus_no,bus_name  from fs_store_scrm ")
+    @Select("select store_id ,store_name  from fs_store_scrm ")
+    List<FsStoreScrmVO> selectFsAllStoreList();
 }

+ 3 - 0
fs-service/src/main/java/com/fs/hisStore/service/IFsStoreScrmService.java

@@ -3,6 +3,7 @@ package com.fs.hisStore.service;
 import com.fs.his.param.FsStoreAuditParam;
 import com.fs.hisStore.domain.FsStoreScrm;
 import com.fs.hisStore.vo.FsStoreRecommendListVO;
+import com.fs.hisStore.vo.FsStoreScrmVO;
 
 import java.util.List;
 
@@ -81,4 +82,6 @@ public interface IFsStoreScrmService
     int batchUpdateStatusByIds(List<Long> ids, Integer status);
 
     List<FsStoreRecommendListVO> storeRecommendList();
+
+    List<FsStoreScrmVO> selectAllStore();
 }

+ 5 - 1
fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreCartScrmServiceImpl.java

@@ -11,6 +11,7 @@ import com.fs.erp.dto.ErpGoodsStockQueryResponse;
 import com.fs.erp.service.IErpGoodsService;
 import com.fs.his.utils.ConfigUtil;
 import com.fs.hisStore.config.FsErpConfig;
+import com.fs.hisStore.config.MedicalMallConfig;
 import com.fs.hisStore.domain.FsStoreCartScrm;
 import com.fs.hisStore.domain.FsStoreProductAttrValueScrm;
 import com.fs.hisStore.domain.FsStoreProductGroupScrm;
@@ -65,6 +66,9 @@ public class FsStoreCartScrmServiceImpl implements IFsStoreCartScrmService
     @Autowired
     private ConfigUtil configUtil;
 
+    @Autowired
+    private MedicalMallConfig medicalMallConfig;
+
 
 
     /**
@@ -200,7 +204,7 @@ public class FsStoreCartScrmServiceImpl implements IFsStoreCartScrmService
 
     @Override
     public List<FsStoreCartVO> selectFsStoreCartListByUid(long uid) {
-        return fsStoreCartMapper.selectFsStoreCartListByUid(uid);
+        return fsStoreCartMapper.selectFsStoreCartListByUid(uid, medicalMallConfig);
     }
 
     @Override

+ 5 - 1
fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreProductAttrValueScrmServiceImpl.java

@@ -2,6 +2,7 @@ package com.fs.hisStore.service.impl;
 
 import java.util.List;
 
+import com.fs.hisStore.config.MedicalMallConfig;
 import com.fs.hisStore.param.FsProductAttrValueParam;
 import com.fs.hisStore.param.FsStoreProductAttrValueQueryParam;
 import com.fs.hisStore.param.FsStoreTuiProductAttrValueParam;
@@ -26,6 +27,9 @@ public class FsStoreProductAttrValueScrmServiceImpl implements IFsStoreProductAt
     @Autowired
     private FsStoreProductAttrValueScrmMapper fsStoreProductAttrValueMapper;
 
+    @Autowired
+    private MedicalMallConfig config;
+
     /**
      * 查询商品属性值
      *
@@ -115,7 +119,7 @@ public class FsStoreProductAttrValueScrmServiceImpl implements IFsStoreProductAt
 
     @Override
     public List<FsStoreProductAttrValueQueryVO> selectStoreProductAttrValueListQuery(FsStoreProductAttrValueQueryParam param) {
-        return fsStoreProductAttrValueMapper.selectStoreProductAttrValueListQuery(param);
+        return fsStoreProductAttrValueMapper.selectStoreProductAttrValueListQuery(param, config);
     }
 
     @Override

+ 14 - 10
fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreProductScrmServiceImpl.java

@@ -25,6 +25,7 @@ import com.fs.his.utils.ConfigUtil;
 import com.fs.his.vo.FsStoreProductExcelVO;
 import com.fs.his.vo.FsStoreProductListSVO;
 import com.fs.his.vo.OptionsVO;
+import com.fs.hisStore.config.MedicalMallConfig;
 import com.fs.hisStore.domain.*;
 import com.fs.hisStore.mapper.*;
 import com.fs.hisStore.utils.StoreAuditLogUtil;
@@ -90,6 +91,9 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
     @Autowired
     private FsStoreScrmServiceImpl fsStoreScrmService;
 
+    @Autowired
+    private MedicalMallConfig medicalMallConfig;
+
     /**
      * 查询商品
      *
@@ -216,7 +220,7 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
     }
 
     @Override
-    public Map<String, Object> getFormatAttr(Long productId, String jsonStr) {
+    public Map<String, Object> getFormatAttr(Long productId, String jsonStr,Long[] stores) {
         JSONObject jsonObject = JSON.parseObject(jsonStr);
         Map<String, Object> resultMap = new LinkedHashMap<>(3);
         if (jsonObject == null || jsonObject.get("attrs") == null || jsonObject.getJSONArray("attrs").isEmpty()) {
@@ -389,7 +393,7 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
         fsStoreProductAttrMapper.clear(productId);
         //清空values
         //查出商品属性所有ID;
-        List<FsStoreProductAttrValueScrm> attrValues=fsStoreProductAttrValueMapper.selectFsStoreProductAttrValueByProductId(productId);
+        List<FsStoreProductAttrValueScrm> attrValues=fsStoreProductAttrValueMapper.selectFsStoreProductAttrValueByProductId(productId,null);
         fsStoreProductAttrValueMapper.deleteFsStoreProductAttrValueByProductId(productId);
         //写入attr
         for(ProductArrtDTO vo:items){
@@ -659,8 +663,8 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
     }
 
     @Override
-    public FsStoreProductQueryVO selectFsStoreProductByIdQuery(Long productId) {
-        return fsStoreProductMapper.selectFsStoreProductByIdQuery(productId);
+    public FsStoreProductQueryVO selectFsStoreProductByIdQuery(Long productId,String storeId) {
+        return fsStoreProductMapper.selectFsStoreProductByIdQuery(productId,storeId,medicalMallConfig);
     }
 
     @Override
@@ -684,27 +688,27 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
 
     @Override
     public List<FsStoreProductListQueryVO> selectFsStoreProductNewQuery(int count) {
-        return fsStoreProductMapper.selectFsStoreProductNewQuery(count);
+        return fsStoreProductMapper.selectFsStoreProductNewQuery(count,medicalMallConfig);
     }
 
     @Override
     public List<FsStoreProductListQueryVO> selectFsStoreProductHotQuery(int count) {
-        return fsStoreProductMapper.selectFsStoreProductHotQuery(count);
+        return fsStoreProductMapper.selectFsStoreProductHotQuery(count,medicalMallConfig);
     }
 
     @Override
     public List<FsStoreProductListQueryVO> selectFsStoreProductGoodQuery(int count) {
-        return fsStoreProductMapper.selectFsStoreProductGoodQuery(count);
+        return fsStoreProductMapper.selectFsStoreProductGoodQuery(count,medicalMallConfig);
     }
 
     @Override
     public List<FsStoreProductListQueryVO> selectFsStoreProductTuiListQuery() {
-        return fsStoreProductMapper.selectFsStoreProductTuiListQuery();
+        return fsStoreProductMapper.selectFsStoreProductTuiListQuery(medicalMallConfig);
     }
 
     @Override
     public List<FsStoreProductListQueryVO> selectFsStoreProductGoodListQuery() {
-        return fsStoreProductMapper.selectFsStoreProductGoodListQuery();
+        return fsStoreProductMapper.selectFsStoreProductGoodListQuery(medicalMallConfig);
     }
 
     @Override
@@ -1018,6 +1022,6 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
 
     @Override
     public List<FsStoreProductActivityListVO> selectFsStoreProductByIdsAudit(String productIds) {
-        return fsStoreProductMapper.selectFsStoreProductByIdsAudit(productIds);
+        return fsStoreProductMapper.selectFsStoreProductByIdsAudit(productIds,medicalMallConfig);
     }
 }

+ 8 - 0
fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreScrmServiceImpl.java

@@ -14,6 +14,7 @@ import com.fs.hisStore.service.IFsHisStoreAuditLogScrmService;
 import com.fs.hisStore.service.IFsStoreScrmService;
 import com.fs.hisStore.utils.StoreAuditLogUtil;
 import com.fs.hisStore.vo.FsStoreRecommendListVO;
+import com.fs.hisStore.vo.FsStoreScrmVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -192,6 +193,7 @@ public class FsStoreScrmServiceImpl implements IFsStoreScrmService
         FsStoreScrm fsStoreScrm = new FsStoreScrm();
         fsStoreScrm.setStatus(1);//启用
         fsStoreScrm.setIsAudit(1);//审核通过
+        //List<FsStoreScrm>  storeList =  fsStoreMapper.selectFsStoreList( fsStoreScrm);
 //        List<FsStoreScrm>  storeList =  fsStoreMapper.selectFsStoreList(fsStoreScrm);
         List<FsStoreScrm>  storeList =  fsStoreMapper.selectFsStoreListByProduct(fsStoreScrm); //查询有商品的列表
         return storeList.stream().map(store -> {
@@ -210,4 +212,10 @@ public class FsStoreScrmServiceImpl implements IFsStoreScrmService
         }).collect(Collectors.toList());
     }
 
+    @Override
+    public List<FsStoreScrmVO> selectAllStore() {
+        return fsStoreMapper.selectFsAllStoreList();
+    }
+
 }
+