cms数据接口迁移

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

@@ -17,9 +17,7 @@ import com.gic.haoban.manage.api.enums.content.MaterialReportType;
 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.MaterialAnalyzeDataQO;
-import com.gic.haoban.manage.web.qo.content.statistics.MaterialReportQO;
-import com.gic.haoban.manage.web.qo.content.statistics.MaterialStatisticsBaseQO;
+import com.gic.haoban.manage.web.qo.content.statistics.*;
 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;
@@ -171,8 +169,7 @@ public class MaterialDataStaticsController {
         } else {
             storeIds.add(materialStatisticsBaseQO.getStoreId());
         }
-        Page<MaterialClerkUsedDataVO> clerkUsedData = materialDataAdaptor.queryMaterialClerkUsedData(materialStatisticsBaseQO.getEnterpriseId(), storeIds,
-                materialStatisticsBaseQO.getFixedDateDiff(), materialStatisticsBaseQO.getOrderByField(), materialStatisticsBaseQO.getOrder(), materialStatisticsBaseQO.getPageNum(), materialStatisticsBaseQO.getPageSize());
+        Page<MaterialClerkUsedDataVO> clerkUsedData = materialDataAdaptor.queryMaterialClerkUsedData(materialStatisticsBaseQO,storeIds);
         return RestResponse.successResult(clerkUsedData);
     }
 
@@ -182,15 +179,14 @@ public class MaterialDataStaticsController {
      * @return
      */
     @RequestMapping(path = "/content/material/store/data")
-    public RestResponse<Page<MaterialStoreUsedDataVO>> queryMaterialStoreUsedData(@RequestBody MaterialAnalyzeDataQO materialStatisticsBaseQO) {
+    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());
         } else {
             storeIds.add(materialStatisticsBaseQO.getStoreId());
         }
-        Page<MaterialStoreUsedDataVO> storeUsedData = materialDataAdaptor.queryMaterialStoreUsedData(materialStatisticsBaseQO.getEnterpriseId(), storeIds,
-                materialStatisticsBaseQO.getFixedDateDiff(), materialStatisticsBaseQO.getOrderByField(), materialStatisticsBaseQO.getOrder(), materialStatisticsBaseQO.getPageNum(), materialStatisticsBaseQO.getPageSize());
+        Page<MaterialStoreUsedDataVO> storeUsedData = materialDataAdaptor.queryMaterialStoreUsedData(materialStatisticsBaseQO,storeIds);
         if (CollectionUtils.isNotEmpty(storeUsedData.getResult())) {
             List<String> tempStoreIds = storeUsedData.getResult()
                     .stream()
@@ -273,7 +269,7 @@ public class MaterialDataStaticsController {
      * @return
      */
     @RequestMapping(path = "/content/material/store/used/data")
-    public RestResponse<MaterialStoreUsedDataVO> queryMaterialStoreUseReport(@RequestBody MaterialReportQO materialReportQO) {
+    public RestResponse<MaterialStoreUsedDataVO> queryMaterialStoreUseReport(@RequestBody MaterialStoreReportQO materialReportQO) {
 
         List<String> storeIds = new ArrayList<>();
         if (StringUtils.isBlank(materialReportQO.getStoreId())) {
@@ -391,7 +387,7 @@ public class MaterialDataStaticsController {
      * @return
      */
     @RequestMapping(path = "/content/material/store/used/data/list")
-    public RestResponse<Page<MaterialStoreUsedDataVO>> queryMaterialStoreUseReportList(@RequestBody MaterialReportQO materialReportQO) {
+    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());

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/exception/GlobalExceptionHandler.java

 package com.gic.haoban.manage.web.exception;
 
+import com.gic.commons.exception.DataApiException;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.ShowFrontMessageException;
 import com.gic.haoban.common.utils.HaobanResponse;
@@ -133,4 +134,17 @@ public class GlobalExceptionHandler extends WebBaseController {
     public HaobanResponse controllerNoLoginException(HttpServletResponse response, NoLoginException ex) {
         return resultResponse(HaoBanErrCode.ERR_4);
     }
+
+    /**
+     * 数据组API错误
+     * @param response
+     * @param ex
+     * @return
+     */
+    @ResponseBody
+    @ExceptionHandler(DataApiException.class)
+    public HaobanResponse dataApiException(HttpServletResponse response, DataApiException ex) {
+        logger.info("DataApiException异常信息", ex);
+        return resultResponse(HaoBanErrCode.ERR_3);
+    }
 }

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

@@ -2,6 +2,9 @@ package com.gic.haoban.manage.web.qo.content.statistics;
 
 import lombok.Data;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @Author MUSI
  * @Date 2023/3/23 1:00 PM
@@ -30,4 +33,17 @@ public class MaterialAnalyzeDataQO extends MaterialStatisticsBaseQO {
      * desc
      */
     private String order;
+
+    public Map<String, Integer> getFieldsOrder() {
+        Map<String, Integer> map = new HashMap<>();
+        map.put("enterpriseId", 1);
+        map.put("useMatlDayNum", 11);
+        map.put("useMatlNum", 12);
+        map.put("singleMatlAvgCnt", 13);
+        return map;
+    }
+
+    public String getDefaultFields() {
+        return "enterpriseId";
+    }
 }

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

@@ -2,6 +2,9 @@ package com.gic.haoban.manage.web.qo.content.statistics;
 
 import lombok.Data;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @Author MUSI
  * @Date 2023/3/23 12:48 PM
@@ -38,4 +41,24 @@ public class MaterialReportQO extends MaterialStatisticsBaseQO {
      * 业务周期
      */
     private String bizDate;
+
+    public Map<String, Integer> getFieldsOrder() {
+        Map<String, Integer> map = new HashMap<>();
+        map.put("enterpriseId", 1);
+        map.put("useMatlNum", 5);
+        map.put("useMatlNumRank", 6);
+        map.put("useMatlNumRatio", 7);
+        map.put("userClickNum", 8);
+        map.put("userClickNumRatio", 9);
+        map.put("convUserNum", 10);
+        map.put("convUserNumRatio", 11);
+        map.put("convSalesAmt", 12);
+        map.put("convSalesAmtRank", 13);
+        map.put("convSalesAmtRatio", 14);
+        return map;
+    }
+
+    public String getDefaultFields() {
+        return "enterpriseId";
+    }
 }

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

+package com.gic.haoban.manage.web.qo.content.statistics;
+
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author MUSI
+ * @Date 2023/3/23 1:00 PM
+ * @Description
+ * @Version
+ **/
+@Data
+public class MaterialStoreAnalyzeDataQO extends MaterialStatisticsBaseQO {
+
+    private static final long serialVersionUID = 3422937373665522931L;
+    /**
+     * 时间筛选
+     * 1 过去7天(默认选中),2 过去30天,3 过去60天,4 过去90天,5本周,6 本月,7 上月,8 上上月,9 上上上月
+     */
+    private Integer fixedDateDiff;
+
+    /**
+     * 排序字段
+     * 日均使用导购占比
+     * 转化客户数
+     */
+    private String orderByField;
+
+    /**
+     * asc
+     * desc
+     */
+    private String order;
+
+    public Map<String, Integer> getFieldsOrder() {
+        Map<String, Integer> map = new HashMap<>();
+        map.put("enterpriseId", 1);
+        map.put("dayAvgUseMatlNum", 5);
+        map.put("dayAvgUseRate", 6);
+        map.put("clickUserNum", 7);
+        map.put("convUserNum", 8);
+        map.put("convSalesNmt", 9);
+        return map;
+    }
+
+    public String getDefaultFields() {
+        return "enterpriseId";
+    }
+}

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

+package com.gic.haoban.manage.web.qo.content.statistics;
+
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author MUSI
+ * @Date 2023/3/23 12:48 PM
+ * @Description
+ * @Version
+ * 素材
+ **/
+@Data
+public class MaterialStoreReportQO extends MaterialStatisticsBaseQO {
+
+    private static final long serialVersionUID = -4105397589798480404L;
+
+    /**
+     * 数据类型
+     * 1 周报; 2 月报
+     * @see com.gic.haoban.manage.api.enums.content.MaterialReportType
+     */
+    private Integer reportType;
+
+    /**
+     * 排序字段
+     * 日均使用导购占比
+     * 转化客户数
+     */
+    private String orderByField;
+
+    /**
+     * asc
+     * desc
+     */
+    private String order;
+
+    /**
+     * 业务周期
+     */
+    private String bizDate;
+
+    public Map<String, Integer> getFieldsOrder() {
+        Map<String, Integer> map = new HashMap<>();
+        map.put("enterpriseId", 1);
+        map.put("dayAvgUseMatlNum", 4);
+        map.put("dayAvgUseMatlNumRatio", 5);
+        map.put("dayAvgUseBindProportion", 6);
+        map.put("dayAvgUseBindProportionRatio", 7);
+        map.put("userClickNum", 8);
+        map.put("userClickNumRatio", 9);
+        map.put("convUserNum", 10);
+        map.put("convUserNumRatio", 11);
+        map.put("convSalesAmt", 12);
+        map.put("convSalesAmtRank", 13);
+        map.put("convSalesAmtRatio", 14);
+        return map;
+    }
+
+    public String getDefaultFields() {
+        return "enterpriseId";
+    }
+}