数据结构修改

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

@@ -156,11 +156,12 @@ public class WeekMonthDataAdaptor {
         inlineParams.put("orderByFields", 2);
         inlineParams.put("orderByType", 1);
         Map<String, Object> result = DataApiUtils.http(JSON.toJSONString(inlineParams), apolloKey);
-        if (result.get("data") == null) {
+        List<JSONObject> dataList = DataApiUtils.getDataList(result);
+        if (CollectionUtils.isEmpty(dataList)) {
             return null;
         }
-        JSONObject jsonObject = DataApiUtils.getPageOne(result);
-        if (jsonObject == null) {
+        JSONObject jsonObject = dataList.get(0);
+        if (jsonObject.isEmpty()) {
             return null;
         }
         BigDecimal useMatlNum = Optional.ofNullable(jsonObject.getBigDecimal("useMatlNum")).orElse(BigDecimal.ZERO);
@@ -193,11 +194,12 @@ public class WeekMonthDataAdaptor {
             inlineParams.put("storeId", StringUtils.join(storeIds, ","));
         }
         Map<String, Object> result = DataApiUtils.http(JSON.toJSONString(inlineParams), apolloKey);
-        if (result.get("data") == null) {
+        List<JSONObject> dataList = DataApiUtils.getDataList(result);
+        if (CollectionUtils.isEmpty(dataList)) {
             return null;
         }
-        JSONObject jsonObject = DataApiUtils.getPageOne(result);
-        if (jsonObject == null) {
+        JSONObject jsonObject = dataList.get(0);
+        if (jsonObject.isEmpty()) {
             return null;
         }
         BigDecimal dayAvgUseMatlNum = jsonObject.getBigDecimal("dayAvgUseMatlNum");