活码链接数据统计接口入参调整

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java

@@ -9,6 +9,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSON;
+import com.gic.haoban.manage.web.qo.hm.data.HmLinkChartQO;
+import com.gic.haoban.manage.web.qo.hm.data.HmLinkClerkListQO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -611,9 +614,12 @@ public class HmLinkController {
 
     // 统计图表
     @RequestMapping("statistics/chart")
-    public RestResponse<Object> statisticsChart(Long linkId, Date startTime, Date endTime) {
+    public RestResponse<Object> statisticsChart(@RequestBody HmLinkChartQO qo) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
 
+        Long linkId = qo.getLinkId();
+        Date startTime = qo.getStartTime();
+        Date endTime = qo.getEndTime();
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("enterpriseId", loginUser.getEnterpriseId());
         jsonObject.put("linkId", linkId);
@@ -675,36 +681,11 @@ public class HmLinkController {
 
     // 导购统计
     @RequestMapping("statistics/clerk")
-    public RestResponse<Object> statisticsClerk(Long linkId, String storeSearchParams, String clerkSearchParams,
-            Date startTime, Date endTime, BasePageInfo basePageInfo, String sortColumn, String sortType) {
+    public RestResponse<Object> statisticsClerk(@RequestBody HmLinkClerkListQO qo) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("enterpriseId", loginUser.getEnterpriseId());
-        jsonObject.put("linkId", linkId);
-        if (startTime != null) {
-            jsonObject.put("startTime", DateUtil.getStartTimeOfDay(startTime));
-        }
-        if (endTime != null) {
-            jsonObject.put("endTime", DateUtil.getEndTimeOfDay(endTime));
-        }
-        if (StringUtils.isNotBlank(storeSearchParams)) {
-            jsonObject.put("linkSelect1", storeSearchParams);
-        }
-        if (StringUtils.isNotBlank(clerkSearchParams)) {
-            jsonObject.put("linkSelect2", clerkSearchParams);
-        }
-        if (StringUtils.isBlank(sortColumn)) {
-            // 今日新增人数
-            sortColumn = "addNum";
-        }
-        if (StringUtils.isBlank(sortType)) {
-            sortType = "desc";
-        }
-        jsonObject.put("orderByField", sortColumn + " " + sortType);
-        JSONObject param = DataStatisticsParamUtils.getParam(basePageInfo, jsonObject);
+        qo.getInFields().setEnterpriseId(loginUser.getEnterpriseId());
         return DataStatisticsParamUtils
-                .responsePage(DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_link_detail, param));
+                .responsePage(DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_link_detail, JSON.toJSONString(qo)));
     }
 
     /**

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/hm/data/HmLinkChartQO.java

+package com.gic.haoban.manage.web.qo.hm.data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author guojx
+ * @Date 2022/7/19 16:35
+ */
+public class HmLinkChartQO implements Serializable {
+
+    private Long linkId;
+    private Date startTime;
+    private Date endTime;
+
+    public Long getLinkId() {
+        return linkId;
+    }
+
+    public HmLinkChartQO setLinkId(Long linkId) {
+        this.linkId = linkId;
+        return this;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public HmLinkChartQO setStartTime(Date startTime) {
+        this.startTime = startTime;
+        return this;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public HmLinkChartQO setEndTime(Date endTime) {
+        this.endTime = endTime;
+        return this;
+    }
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/hm/data/HmLinkClerkListQO.java

+package com.gic.haoban.manage.web.qo.hm.data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HmLinkClerkListQO implements Serializable {
+    private InFields inFields;
+    private Integer pageNo;
+    private Integer pageSize;
+
+    public InFields getInFields() {
+        return inFields;
+    }
+
+    public void setInFields(InFields inFields) {
+        this.inFields = inFields;
+    }
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public static class InFields {
+        private String enterpriseId;
+        private Long linkId;
+        private Date startTime;
+        private Date endTime;
+        private String orderByField;
+        /**
+         * 门店名/code
+         */
+        private String linkSelect1;
+        /**
+         * 导购code/名称
+         */
+        private String linkSelect2;
+
+        public String getEnterpriseId() {
+            return enterpriseId;
+        }
+
+        public InFields setEnterpriseId(String enterpriseId) {
+            this.enterpriseId = enterpriseId;
+            return this;
+        }
+
+        public Long getLinkId() {
+            return linkId;
+        }
+
+        public InFields setLinkId(Long linkId) {
+            this.linkId = linkId;
+            return this;
+        }
+
+        public Date getStartTime() {
+            return startTime;
+        }
+
+        public InFields setStartTime(Date startTime) {
+            this.startTime = startTime;
+            return this;
+        }
+
+        public Date getEndTime() {
+            return endTime;
+        }
+
+        public InFields setEndTime(Date endTime) {
+            this.endTime = endTime;
+            return this;
+        }
+
+        public String getOrderByField() {
+            return orderByField;
+        }
+
+        public InFields setOrderByField(String orderByField) {
+            this.orderByField = orderByField;
+            return this;
+        }
+
+        public String getLinkSelect1() {
+            return linkSelect1;
+        }
+
+        public InFields setLinkSelect1(String linkSelect1) {
+            this.linkSelect1 = linkSelect1;
+            return this;
+        }
+
+        public String getLinkSelect2() {
+            return linkSelect2;
+        }
+
+        public InFields setLinkSelect2(String linkSelect2) {
+            this.linkSelect2 = linkSelect2;
+            return this;
+        }
+    }
+}