cms迁移

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/MaterialDataAdaptor.java

 package com.gic.haoban.manage.service.service.content.adaptor;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.gic.commons.util.DataApiUtils;
 import com.gic.haoban.manage.api.enums.content.MaterialReportType;
 import com.gic.haoban.manage.service.util.DataTargetHttpUtils;
 import lombok.AllArgsConstructor;
@@ -76,17 +78,16 @@ public class MaterialDataAdaptor {
         if (MaterialReportType.MONTH.getCode().equals(reportType)) {
             apolloKey = CLERK_MONTH_DATA;
         }
-        Map<String, Object> params = new HashMap<>();
         Map<String, Object> inlineParams = new HashMap<>();
-        params.put("inFields", inlineParams);
         if (org.apache.commons.lang3.StringUtils.isNotBlank(clerkId)) {
             inlineParams.put("clerkId", clerkId);
         }
         inlineParams.put("enterpriseId", enterpriseId);
         inlineParams.put("bizDate", bizDate);
         inlineParams.put("storeId", storeId);
-        inlineParams.put("orderByField", "storeId asc");
-        Map<String, Object> result = this.doHttp(JSON.toJSONString(params), apolloKey);
+        inlineParams.put("orderByFields", 2);
+        inlineParams.put("orderByType", 1);
+        Map<String, Object> result = DataApiUtils.http(inlineParams.toString(), apolloKey);
         if (result.get("data") == null) {
             return null;
         }
@@ -124,9 +125,7 @@ public class MaterialDataAdaptor {
         if (MaterialReportType.MONTH.getCode().equals(reportType)) {
             apolloKey = AREA_MONTH_DATA;
         }
-        Map<String, Object> params = new HashMap<>();
         Map<String, Object> inlineParams = new HashMap<>();
-        params.put("inFields", inlineParams);
         if (org.apache.commons.lang3.StringUtils.isNotBlank(clerkId)) {
             inlineParams.put("clerkId", clerkId);
         }
@@ -136,7 +135,7 @@ public class MaterialDataAdaptor {
         if (CollectionUtils.isNotEmpty(storeIds)) {
             inlineParams.put("storeId", StringUtils.join(storeIds, ","));
         }
-        Map<String, Object> result = this.doHttp(JSON.toJSONString(params), apolloKey);
+        Map<String, Object> result = DataApiUtils.http(inlineParams.toString(), apolloKey);
         if (result.get("data") == null) {
             return null;
         }