Merge remote-tracking branch 'origin/feature-2024-11-05-add-store-status-filter'…

Merge remote-tracking branch 'origin/feature-2024-11-05-add-store-status-filter' into feature-2024-11-05-add-store-status-filter

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentMaterialController.java

@@ -24,6 +24,7 @@ import com.gic.haoban.manage.web.controller.content.adaptor.MaterialDataAdaptor;
 import com.gic.haoban.manage.web.controller.goods.GoodsInfoAdaptor;
 import com.gic.haoban.manage.web.qo.content.*;
 import com.gic.haoban.manage.web.qo.content.like.ContentMaterialLikeQO;
+import com.gic.haoban.manage.web.utils.storestatusfilter.StoreStatusFilterUtils;
 import com.gic.haoban.manage.web.vo.content.*;
 import com.gic.haoban.manage.web.vo.content.statistics.ContentMaterialKnowVO;
 import com.gic.store.goods.enums.ThirdTypeEnum;
@@ -77,11 +78,12 @@ public class ContentMaterialController {
      */
     @RequestMapping(path = "/column-list")
     public RestResponse<List<ContentColumnInfoVO>> queryContentColumn(String enterpriseId, String storeId, String wxEnterpriseId, String clerkId,
-                                                                      Integer columnType) {
+                                                                      Integer columnType,Integer storeStatusFilter) {
         List<String> storeIdList = new ArrayList<>();
         if (StringUtils.isBlank(storeId)) {
             // 区经 获取管辖的权限
-            List<String> storeIds = this.clerkStoreAdaptor.queryClerkStoreIds(clerkId, wxEnterpriseId);
+            List<String> storeIds = this.clerkStoreAdaptor.queryClerkStoreIds(clerkId, wxEnterpriseId,
+                    StoreStatusFilterUtils.getStoreStatusList(storeStatusFilter));
             storeIdList.addAll(storeIds);
         } else {
             storeIdList.add(storeId);
@@ -127,7 +129,8 @@ public class ContentMaterialController {
         }
         if (StringUtils.isBlank(contentMaterialQO.getStoreId())) {
             // 区经 获取管辖的权限
-            List<String> storeIds = this.clerkStoreAdaptor.queryClerkStoreIds(contentMaterialQO.getClerkId(), contentMaterialQO.getWxEnterpriseId());
+            List<String> storeIds = this.clerkStoreAdaptor.queryClerkStoreIds(contentMaterialQO.getClerkId(), contentMaterialQO.getWxEnterpriseId(),
+                    StoreStatusFilterUtils.getStoreStatusList(contentMaterialQO.getStoreStatusFilter()));
             pageQDTO.setStoreIdList(storeIds);
         } else {
             pageQDTO.setStoreIdList(Collections.singletonList(contentMaterialQO.getStoreId()));

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/MaterialDataStaticsController.java

@@ -21,6 +21,7 @@ import com.gic.haoban.manage.web.controller.content.adaptor.ClerkStoreAdaptor;
 import com.gic.haoban.manage.web.controller.content.adaptor.MaterialDataAdaptor;
 import com.gic.haoban.manage.web.qo.content.ContentMaterialBaseQO;
 import com.gic.haoban.manage.web.qo.content.statistics.*;
+import com.gic.haoban.manage.web.utils.storestatusfilter.StoreStatusFilterUtils;
 import com.gic.haoban.manage.web.vo.content.statistics.MaterialAreaUsedDataVO;
 import com.gic.haoban.manage.web.vo.content.statistics.MaterialClerkUsedDataVO;
 import com.gic.haoban.manage.web.vo.content.statistics.MaterialDataOverviewVO;
@@ -83,7 +84,8 @@ public class MaterialDataStaticsController {
         List<String> storeIds = new ArrayList<>();
         if (StringUtils.isBlank(contentMaterialBaseQO.getStoreId())) {
             // 区经 获取管辖的权限
-            storeIds = this.clerkStoreAdaptor.queryClerkStoreIds(contentMaterialBaseQO.getClerkId(), contentMaterialBaseQO.getWxEnterpriseId());
+            storeIds = this.clerkStoreAdaptor.queryClerkStoreIds(contentMaterialBaseQO.getClerkId(), contentMaterialBaseQO.getWxEnterpriseId(),
+                    StoreStatusFilterUtils.getStoreStatusList(contentMaterialBaseQO.getStoreStatusFilter()));
             search.setStoreIdList(storeIds);
         } else {
             storeIds.add(contentMaterialBaseQO.getStoreId());
@@ -129,7 +131,8 @@ public class MaterialDataStaticsController {
 
         List<String> storeIds = new ArrayList<>();
         if (StringUtils.isBlank(materialStatisticsBaseQO.getStoreId())) {
-            storeIds = clerkStoreAdaptor.queryClerkStoreIds(materialStatisticsBaseQO.getClerkId(), materialStatisticsBaseQO.getWxEnterpriseId());
+            storeIds = clerkStoreAdaptor.queryClerkStoreIds(materialStatisticsBaseQO.getClerkId(), materialStatisticsBaseQO.getWxEnterpriseId(),
+                    StoreStatusFilterUtils.getStoreStatusList(materialStatisticsBaseQO.getStoreStatusFilter()));
         } else {
             storeIds.add(materialStatisticsBaseQO.getStoreId());
         }
@@ -155,7 +158,8 @@ public class MaterialDataStaticsController {
 
         List<String> storeIds = new ArrayList<>();
         if (StringUtils.isBlank(materialStatisticsBaseQO.getStoreId())) {
-            storeIds = clerkStoreAdaptor.queryClerkStoreIds(materialStatisticsBaseQO.getClerkId(), materialStatisticsBaseQO.getWxEnterpriseId());
+            storeIds = clerkStoreAdaptor.queryClerkStoreIds(materialStatisticsBaseQO.getClerkId(), materialStatisticsBaseQO.getWxEnterpriseId(),
+                    StoreStatusFilterUtils.getStoreStatusList(materialStatisticsBaseQO.getStoreStatusFilter()));
         } else {
             storeIds.add(materialStatisticsBaseQO.getStoreId());
         }
@@ -175,7 +179,8 @@ public class MaterialDataStaticsController {
         //
         List<String> storeIds = new ArrayList<>();
         if (StringUtils.isBlank(materialStatisticsBaseQO.getStoreId())) {
-            storeIds = clerkStoreAdaptor.queryClerkStoreIds(materialStatisticsBaseQO.getClerkId(), materialStatisticsBaseQO.getWxEnterpriseId());
+            storeIds = clerkStoreAdaptor.queryClerkStoreIds(materialStatisticsBaseQO.getClerkId(), materialStatisticsBaseQO.getWxEnterpriseId(),
+                    StoreStatusFilterUtils.getStoreStatusList(materialStatisticsBaseQO.getStoreStatusFilter()));
         } else {
             storeIds.add(materialStatisticsBaseQO.getStoreId());
         }
@@ -192,7 +197,8 @@ public class MaterialDataStaticsController {
     public RestResponse<Page<MaterialStoreUsedDataVO>> queryMaterialStoreUsedData(@RequestBody MaterialStoreAnalyzeDataQO materialStatisticsBaseQO) {
         List<String> storeIds = new ArrayList<>();
         if (StringUtils.isBlank(materialStatisticsBaseQO.getStoreId())) {
-            storeIds = clerkStoreAdaptor.queryClerkStoreIds(materialStatisticsBaseQO.getClerkId(), materialStatisticsBaseQO.getWxEnterpriseId());
+            storeIds = clerkStoreAdaptor.queryClerkStoreIds(materialStatisticsBaseQO.getClerkId(), materialStatisticsBaseQO.getWxEnterpriseId(),
+                    StoreStatusFilterUtils.getStoreStatusList(materialStatisticsBaseQO.getStoreStatusFilter()));
         } else {
             storeIds.add(materialStatisticsBaseQO.getStoreId());
         }
@@ -231,7 +237,8 @@ public class MaterialDataStaticsController {
     public RestResponse<MaterialPersonalUsedDataVO> queryMaterialUsedReport(@RequestBody MaterialReportQO materialReportQO) {
         List<String> storeIds = new ArrayList<>();
         if (StringUtils.isBlank(materialReportQO.getStoreId())) {
-            storeIds = clerkStoreAdaptor.queryClerkStoreIds(materialReportQO.getClerkId(), materialReportQO.getWxEnterpriseId());
+            storeIds = clerkStoreAdaptor.queryClerkStoreIds(materialReportQO.getClerkId(), materialReportQO.getWxEnterpriseId(),
+                    StoreStatusFilterUtils.getStoreStatusList(materialReportQO.getStoreStatusFilter()));
         } else {
             storeIds.add(materialReportQO.getStoreId());
         }
@@ -283,7 +290,8 @@ public class MaterialDataStaticsController {
 
         List<String> storeIds = new ArrayList<>();
         if (StringUtils.isBlank(materialReportQO.getStoreId())) {
-            storeIds = clerkStoreAdaptor.queryClerkStoreIds(materialReportQO.getClerkId(), materialReportQO.getWxEnterpriseId());
+            storeIds = clerkStoreAdaptor.queryClerkStoreIds(materialReportQO.getClerkId(), materialReportQO.getWxEnterpriseId(),
+                    StoreStatusFilterUtils.getStoreStatusList(materialReportQO.getStoreStatusFilter()));
         } else {
             storeIds.add(materialReportQO.getStoreId());
         }
@@ -334,7 +342,8 @@ public class MaterialDataStaticsController {
     public RestResponse<MaterialAreaUsedDataVO> queryMaterialAreaUseReport(@RequestBody MaterialReportQO materialReportQO) {
         List<String> storeIds = new ArrayList<>();
         if (StringUtils.isBlank(materialReportQO.getStoreId())) {
-            storeIds = clerkStoreAdaptor.queryClerkStoreIds(materialReportQO.getClerkId(), materialReportQO.getWxEnterpriseId());
+            storeIds = clerkStoreAdaptor.queryClerkStoreIds(materialReportQO.getClerkId(), materialReportQO.getWxEnterpriseId(),
+                    StoreStatusFilterUtils.getStoreStatusList(materialReportQO.getStoreStatusFilter()));
         } else {
             storeIds.add(materialReportQO.getStoreId());
         }
@@ -354,7 +363,8 @@ public class MaterialDataStaticsController {
 
         List<String> storeIds = new ArrayList<>();
         if (StringUtils.isBlank(materialReportQO.getStoreId())) {
-            storeIds = clerkStoreAdaptor.queryClerkStoreIds(materialReportQO.getClerkId(), materialReportQO.getWxEnterpriseId());
+            storeIds = clerkStoreAdaptor.queryClerkStoreIds(materialReportQO.getClerkId(), materialReportQO.getWxEnterpriseId(),
+                    StoreStatusFilterUtils.getStoreStatusList(materialReportQO.getStoreStatusFilter()));
         } else {
             storeIds.add(materialReportQO.getStoreId());
         }
@@ -400,7 +410,8 @@ public class MaterialDataStaticsController {
     public RestResponse<Page<MaterialStoreUsedDataVO>> queryMaterialStoreUseReportList(@RequestBody MaterialStoreReportQO materialReportQO) {
         List<String> storeIds = new ArrayList<>();
         if (StringUtils.isBlank(materialReportQO.getStoreId())) {
-            storeIds = clerkStoreAdaptor.queryClerkStoreIds(materialReportQO.getClerkId(), materialReportQO.getWxEnterpriseId());
+            storeIds = clerkStoreAdaptor.queryClerkStoreIds(materialReportQO.getClerkId(), materialReportQO.getWxEnterpriseId(),
+                    StoreStatusFilterUtils.getStoreStatusList(materialReportQO.getStoreStatusFilter()));
         } else {
             storeIds.add(materialReportQO.getStoreId());
         }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/adaptor/ClerkStoreAdaptor.java

@@ -42,13 +42,9 @@ public class ClerkStoreAdaptor {
      * @param wxEnterpriseId
      * @return
      */
-    public List<String> queryClerkStoreIds(String clerkId, String wxEnterpriseId) {
-        List<String> storeIds = staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId, wxEnterpriseId);
+    public List<String> queryClerkStoreIds(String clerkId, String wxEnterpriseId,List<String> storeStatusList) {
+        List<String> storeIds = staffApiService.getHaobanStoreIdsRolesByClerkIdAndStoreStatus(clerkId, wxEnterpriseId,storeStatusList,null);
         if (CollectionUtils.isEmpty(storeIds)) {
-            log.info("根据区经id查询管辖的门店为空 {} {}", clerkId, wxEnterpriseId);
-            return Collections.singletonList("-100");
-        }
-        if (storeIds.size() == 1 && StringUtils.equals(storeIds.get(0), "-1")) {
             // 全部门店权限
             log.info("区经有全部门店权限 {}", clerkId);
             return Collections.emptyList();

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/ContentMaterialBaseQO.java

@@ -52,6 +52,8 @@ public class ContentMaterialBaseQO extends BasePageInfo {
      */
     private String unionId;
 
+    private Integer storeStatusFilter;
+
     public String getEnterpriseId() {
         return enterpriseId;
     }
@@ -115,4 +117,12 @@ public class ContentMaterialBaseQO extends BasePageInfo {
     public void setUnionId(String unionId) {
         this.unionId = unionId;
     }
+
+    public Integer getStoreStatusFilter() {
+        return storeStatusFilter;
+    }
+
+    public void setStoreStatusFilter(Integer storeStatusFilter) {
+        this.storeStatusFilter = storeStatusFilter;
+    }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/ContentMaterialQO.java

@@ -68,6 +68,8 @@ public class ContentMaterialQO extends PageQo {
      */
     private String goodsId;
 
+    private Integer storeStatusFilter;
+
     public Integer getQueryScene() {
         return queryScene;
     }
@@ -155,4 +157,12 @@ public class ContentMaterialQO extends PageQo {
     public void setGoodsId(String goodsId) {
         this.goodsId = goodsId;
     }
+
+    public Integer getStoreStatusFilter() {
+        return storeStatusFilter;
+    }
+
+    public void setStoreStatusFilter(Integer storeStatusFilter) {
+        this.storeStatusFilter = storeStatusFilter;
+    }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/statistics/MaterialStatisticsBaseQO.java

@@ -53,6 +53,8 @@ public class MaterialStatisticsBaseQO extends BasePageInfo {
      */
     private Integer fixedDateDiff;
 
+    private Integer storeStatusFilter;
+
 
     public String getEnterpriseId() {
         return enterpriseId;
@@ -103,6 +105,13 @@ public class MaterialStatisticsBaseQO extends BasePageInfo {
         this.endDate = endDate;
     }
 
+    public Integer getStoreStatusFilter() {
+        return storeStatusFilter;
+    }
+
+    public void setStoreStatusFilter(Integer storeStatusFilter) {
+        this.storeStatusFilter = storeStatusFilter;
+    }
 
     public String convertStartDate(Integer fixedDateDiff) {
         if (fixedDateDiff == null) {