Merge branch 'feature-2024-01-11-data-re' into 'master'

销售结构接口

See merge request !1639

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/data/DataController.java

@@ -230,13 +230,13 @@ public class DataController {
         String apolloKey = "data_sales_perf_mbr_type_overview";
         switch (salesStructureType) {
             case 1:
-                apolloKey = "data_sales_perf_mbr_type_overview";
+                apolloKey = qo.isStoreQuery() ? "data_sales_perf_mbr_type_overview" : "data_sales_perf_clerk_mbr_type_overview";
                 break;
             case 2:
-                apolloKey = "data_sales_perf_birth_type_overview";
+                apolloKey = qo.isStoreQuery() ? "data_sales_perf_birth_type_overview" : "data_sales_perf_clerk_birth_type_overview";
                 break;
             case 3:
-                apolloKey = "data_sales_perf_grade_type_overview";
+                apolloKey = qo.isStoreQuery() ? "data_sales_perf_grade_type_overview" : "data_sales_perf_clerk_grade_type_overview";
                 break;
             default:
         }
@@ -249,6 +249,9 @@ public class DataController {
             jsonParam.put("endDate", qo.getEndDate());
         }
         getAuthStore(qo.getStoreId(), qo.getClerkId(), qo.getWxEnterpriseId(), jsonParam);
+        if (!qo.isStoreQuery()) {
+            jsonParam.put("clerkId", qo.getClerkId());
+        }
         jsonParam.put("groupType", 1);
         Map<String, Object> res = DataApiUtils.http(jsonParam.toJSONString(), apolloKey);
         List<JSONObject> list = DataApiUtils.getDataList(res);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/data/SalesStructureQO.java

@@ -17,6 +17,11 @@ public class SalesStructureQO implements Serializable {
     private Integer salesStructureType = 1;
 
     /**
+     * 1：门店 2：导购
+     */
+    private Integer storeClerkFlag = 1;
+
+    /**
      * 开始时间
      */
     private String startDate;
@@ -45,4 +50,8 @@ public class SalesStructureQO implements Serializable {
      * 如果是区经，用于查询管辖门店权限
      */
     private String clerkId;
+
+    public boolean isStoreQuery() {
+        return storeClerkFlag != null && storeClerkFlag == 1;
+    }
 }