看数据会员接口拆分

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

@@ -12,7 +12,6 @@ import com.gic.commons.util.DataApiUtils;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GlobalVar;
 import com.gic.commons.util.HttpClient;
-import com.gic.commons.util.data.CrossDateUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.api.dto.EnterpriseSettingDTO;
 import com.gic.enterprise.api.dto.EnterpriseSourceChannelDTO;
@@ -344,12 +343,12 @@ public class DataController {
      * @param qo
      * @return
      */
-    @RequestMapping(value = "get-clerk-group-data")
-    @ResponseBody
-    public RestResponse getClerkGroupData(@RequestBody ClerkGroupDataQO qo) {
-        return handle(getHandel(qo, "data_sales_perf_anal_cont_clerk_group",
-                JSONObject.toJSONString(qo.getApiParam())));
-    }
+//    @RequestMapping(value = "get-clerk-group-data")
+//    @ResponseBody
+//    public RestResponse getClerkGroupData(@RequestBody ClerkGroupDataQO qo) {
+//        return handle(getHandel(qo, "data_sales_perf_anal_cont_clerk_group",
+//                JSONObject.toJSONString(qo.getApiParam())));
+//    }
 
     /**
      * 店长/导购实时销售数据
@@ -376,6 +375,83 @@ public class DataController {
                 JSONObject.toJSONString(qo.getApiParam())));
     }
 
+    /**
+     * 店长非实时新增会员数据
+     * 1:data_mbr_scale_stat_new_day_overview
+     * 2:data_mbr_scale_stat_new_week_overview
+     * 3:data_mbr_scale_stat_new_month_overview
+     * 5:data_mbr_scale_stat_new_year_overview
+     * 4:data_mbr_scale_stat_new_custm_overview
+     * @param qo
+     * @return
+     */
+    @RequestMapping(value = "get-store-new-member-data")
+    @ResponseBody
+    public RestResponse getStoreMemberData(@RequestBody StoreNewMemberDataQO qo) {
+        return handle(getHandel(qo, qo.getApolloKeyByType(),
+                JSONObject.toJSONString(qo.getApiParam())));
+    }
+
+    /**
+     * 店长/导购会员数据
+     * 1:data_mbr_scale_stat_clerk_overview
+     * 2:data_mbr_scale_stat_week_clerk_overview
+     * 3:data_mbr_scale_stat_month_clerk_overview
+     * 5:data_mbr_scale_stat_year_clerk_overview
+     * 4:data_mbr_scale_stat_custm_clerk_overview
+     * @param qo
+     * @return
+     */
+//    @RequestMapping(value = "get-store-clerk-member-data")
+//    @ResponseBody
+//    public RestResponse getClerkMemberData(@RequestBody StoreMemberDataQO qo) {
+//        return handle(getHandel(qo, qo.getApolloKeyByType(),JSONObject.toJSONString(qo.getApiParam())));
+//    }
+
+    /**
+     * 店长总会员数据
+     * 1:data_mbr_scale_stat_sum_overview
+     * 2:data_mbr_scale_stat_main_sum_overview
+     * @param qo
+     * @return
+     */
+    @RequestMapping(value = "get-store-sum-member-data")
+    @ResponseBody
+    public RestResponse getStoreSumMemberData(@RequestBody StoreSumMemberDataQO qo) {
+        return handle(getHandel(qo, qo.getApolloKeyByType(),JSONObject.toJSONString(qo.getApiParam())));
+    }
+
+    /**
+     * 导购非实时新增会员数据
+     * 1:data_mbr_scale_stat_new_day_clerk_overview
+     * 2:data_mbr_scale_stat_new_week_clerk_overview
+     * 3:data_mbr_scale_stat_new_month_clerk_overview
+     * 5:data_mbr_scale_stat_new_year_overview
+     * 4:data_mbr_scale_stat_new_custm_clerk_overview
+     * @param qo
+     * @return
+     */
+    @RequestMapping(value = "get-clerk-new-member-data")
+    @ResponseBody
+    public RestResponse getClerkNewMemberData(@RequestBody ClerkNewMemberDataQO qo) {
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(qo.getApiParam());
+        jsonObject.put("clerkId", qo.getClerkId());
+        return handle(getHandel(qo, qo.getApolloKeyByType(), jsonObject.toJSONString()));
+    }
+
+    /**
+     * 店长实时会员数据
+     * 1:data_mbr_scale_real_time_rel_overview
+     * 2:data_mbr_scale_real_time_opencard_overview
+     * @param qo
+     * @return
+     */
+    @RequestMapping(value = "get-store-real-time-member-data")
+    @ResponseBody
+    public RestResponse getStoreRealTimeMemberData(@RequestBody StoreRealTimeMemberQO qo) {
+        return handle(getHandel(qo, qo.getApolloKeyByType(), JSONObject.toJSONString(qo)));
+    }
+
     private static HandleQO getHandel(CommonQO commonQO, String apolloKey, String params) {
         HandleQO handleQO = EntityUtil.changeEntityNew(HandleQO.class, commonQO);
         handleQO.setApolloKey(apolloKey);

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

+package com.gic.haoban.manage.web.qo.data;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author guojx
+ * @Date 2024/4/30 10:29
+ */
+@Data
+public class ClerkNewMemberApiQO implements Serializable {
+    private String storeId;
+
+    /**
+     * 1 合计  2趋势图
+     */
+    private Integer storeGroup;
+
+    /**
+     * 业务日期开始时间
+     */
+    private String startDate;
+
+    /**
+     * 业务日期结束时间
+     */
+    private String endDate;
+}

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

+package com.gic.haoban.manage.web.qo.data;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author guojx
+ * @Date 2024/4/30 10:29
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ClerkNewMemberDataQO extends CommonQO implements Serializable {
+
+    private ClerkNewMemberApiQO apiParam;
+
+    /**
+     * 1:data_mbr_scale_stat_new_day_clerk_overview
+     * 2:data_mbr_scale_stat_new_week_clerk_overview
+     * 3:data_mbr_scale_stat_new_month_clerk_overview
+     * 5:data_mbr_scale_stat_new_year_overview
+     * 4:data_mbr_scale_stat_new_custm_clerk_overview
+     */
+    private Integer apiNameType;
+
+
+    public String getApolloKeyByType() {
+        if (apiNameType == null) {
+            apiNameType = 1;
+        }
+        switch (apiNameType) {
+            case 2:
+                return "data_mbr_scale_stat_new_week_clerk_overview";
+            case 3:
+                return "data_mbr_scale_stat_new_month_clerk_overview";
+            case 5:
+                return "data_mbr_scale_stat_new_year_overview";
+            case 4 :
+                return "data_mbr_scale_stat_new_custm_clerk_overview";
+            default:
+                return "data_mbr_scale_stat_new_day_clerk_overview";
+        }
+    }
+}

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

+package com.gic.haoban.manage.web.qo.data;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author guojx
+ * @Date 2024/4/30 10:29
+ */
+@Data
+public class StoreClerkRealTimeMemberApiQO implements Serializable {
+    private Integer pageNum;
+
+    /**
+     * 如果是导购，需要传，店长不传
+     */
+    private String clerkId;
+
+    private Integer pageSize;
+    private String storeId;
+
+    /**
+     * 渠道类型
+     */
+    private String channelCode;
+
+    /**
+     * 聚合类型:9 导购维度聚合 10 导购+渠道维度聚合
+     */
+    private Integer groupType;
+
+
+    /**
+     * 排序字段：1 新增开卡会员 2 新增开卡会员（昨日）
+     */
+    private Integer orderByFields;
+
+    /**
+     * 排序类型 1 升序 2 降序
+     */
+    private Integer orderByType;
+
+}

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

+package com.gic.haoban.manage.web.qo.data;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author guojx
+ * @Date 2024/4/30 10:39
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class StoreClerkRealTimeMemberQO extends CommonQO implements Serializable {
+
+    private StoreClerkRealTimeMemberApiQO apiParam;
+}

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

+package com.gic.haoban.manage.web.qo.data;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author guojx
+ * @Date 2024/4/30 10:29
+ */
+@Data
+public class StoreMemberApiQO implements Serializable {
+    private Integer pageNum;
+
+    /**
+     * 如果是导购，需要传，店长不传
+     */
+    private String clerkId;
+
+    private Integer pageSize;
+    private String storeId;
+
+    /**
+     * 1会员总数开卡导购 2会员总数服务导购 3新增开卡会员数
+     */
+    private Integer orderByFields;
+
+    /**
+     * 排序类型 1 升序 2 降序
+     */
+    private Integer orderByType;
+
+    /**
+     * 业务日期开始时间
+     */
+    private String startDate;
+
+    /**
+     * 业务日期结束时间
+     */
+    private String endDate;
+
+    /**
+     * 聚合维度 8 合计 9 导购维度
+     */
+    private Integer groupType;
+}

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

+package com.gic.haoban.manage.web.qo.data;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author guojx
+ * @Date 2024/4/30 10:29
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class StoreMemberDataQO extends CommonQO implements Serializable {
+
+    private StoreMemberApiQO apiParam;
+
+    /**
+     * 1:data_mbr_scale_stat_clerk_overview
+     * 2:data_mbr_scale_stat_week_clerk_overview
+     * 3:data_mbr_scale_stat_month_clerk_overview
+     * 5:data_mbr_scale_stat_year_clerk_overview
+     * 4:data_mbr_scale_stat_custm_clerk_overview
+     */
+    private Integer apiNameType;
+
+
+    public String getApolloKeyByType() {
+        if (apiNameType == null) {
+            apiNameType = 1;
+        }
+        switch (apiNameType) {
+            case 2:
+                return "data_mbr_scale_stat_week_clerk_overview";
+            case 3:
+                return "data_mbr_scale_stat_month_clerk_overview";
+            case 5:
+                return "data_mbr_scale_stat_year_clerk_overview";
+            case 4 :
+                return "data_mbr_scale_stat_custm_clerk_overview";
+            default:
+                return "data_mbr_scale_stat_clerk_overview";
+        }
+    }
+}

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

+package com.gic.haoban.manage.web.qo.data;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author guojx
+ * @Date 2024/4/30 10:29
+ */
+@Data
+public class StoreNewMemberApiQO implements Serializable {
+    private String storeId;
+
+    /**
+     * 渠道类型
+     */
+    private String mbrChannel;
+
+    /**
+     * 1 企业维度  2单周期维度 3渠道维度 4渠道单周期
+     */
+    private Integer storeGroup;
+
+    /**
+     * 业务日期开始时间
+     */
+    private String startDate;
+
+    /**
+     * 业务日期结束时间
+     */
+    private String endDate;
+
+    /**
+     * 自定义类型才有：业务日期相差天数
+     */
+    private Integer days;
+}

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

+package com.gic.haoban.manage.web.qo.data;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author guojx
+ * @Date 2024/4/30 10:29
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class StoreNewMemberDataQO extends CommonQO implements Serializable {
+
+    private StoreNewMemberApiQO apiParam;
+
+    /**
+     * 1:data_mbr_scale_stat_new_day_overview
+     * 2:data_mbr_scale_stat_new_week_overview
+     * 3:data_mbr_scale_stat_new_month_overview
+     * 5:data_mbr_scale_stat_new_year_overview
+     * 4:data_mbr_scale_stat_new_custm_overview
+     */
+    private Integer apiNameType;
+
+
+    public String getApolloKeyByType() {
+        if (apiNameType == null) {
+            apiNameType = 1;
+        }
+        switch (apiNameType) {
+            case 2:
+                return "data_mbr_scale_stat_new_week_overview";
+            case 3:
+                return "data_mbr_scale_stat_new_month_overview";
+            case 5:
+                return "data_mbr_scale_stat_new_year_overview";
+            case 4 :
+                return "data_mbr_scale_stat_new_custm_overview";
+            default:
+                return "data_mbr_scale_stat_new_day_overview";
+        }
+    }
+}

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

+package com.gic.haoban.manage.web.qo.data;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author guojx
+ * @Date 2024/4/30 10:39
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class StoreRealTimeMemberQO extends CommonQO implements Serializable {
+
+    /**
+     * 1:data_mbr_scale_real_time_rel_overview
+     * 2:data_mbr_scale_real_time_opencard_overview
+     */
+    private Integer apiNameType;
+
+
+    public String getApolloKeyByType() {
+        if (apiNameType == null) {
+            apiNameType = 1;
+        }
+        switch (apiNameType) {
+            case 2:
+                return "data_mbr_scale_real_time_opencard_overview";
+            default:
+                return "data_mbr_scale_real_time_rel_overview";
+        }
+    }
+}

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

+package com.gic.haoban.manage.web.qo.data;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author guojx
+ * @Date 2024/4/30 10:29
+ */
+@Data
+public class StoreSumMemberApiQO implements Serializable {
+    private String storeId;
+
+    /**
+     * 渠道类型
+     */
+    private String mbrChannel;
+}

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

+package com.gic.haoban.manage.web.qo.data;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author guojx
+ * @Date 2024/4/30 10:29
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class StoreSumMemberDataQO extends CommonQO implements Serializable {
+
+    private StoreSumMemberApiQO apiParam;
+
+    /**
+     * 1:data_mbr_scale_stat_sum_overview
+     * 2:data_mbr_scale_stat_main_sum_overview
+     */
+    private Integer apiNameType;
+
+
+    public String getApolloKeyByType() {
+        if (apiNameType == null) {
+            apiNameType = 1;
+        }
+        switch (apiNameType) {
+            case 2:
+                return "data_mbr_scale_stat_main_sum_overview";
+            default:
+                return "data_mbr_scale_stat_sum_overview";
+        }
+    }
+}