数据格式修改 导购是page 区经是list

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

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

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

@@ -797,16 +797,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
             return RestResponse.failure("-701", "参数缺失");
         }
         List<EnterpriseUsingPermissionDto> list = enterpriseUseForbidService.selectEnterprisePermissionByEnterpriseId(enterpriseId);
-        List<EnterpriseUsingPermissionVO> voList = list.stream().map(x -> {
-            EnterpriseUsingPermissionVO vo = EntityUtil.changeEntityByJSON(EnterpriseUsingPermissionVO.class, x);
-            Integer status = vo.getStatus();
-            Date serviceEndDate = vo.getServiceEndDate();
-            // -1 服务到期
-            if (Objects.equals(status, 0) && serviceEndDate != null && serviceEndDate.before(new Date())) {
-                vo.setStatus(-1);
-            }
-            return vo;
-        }).collect(Collectors.toList());
+        List<EnterpriseUsingPermissionVO> voList = EntityUtil.changeEntityListByJSON(EnterpriseUsingPermissionVO.class, list);
         return RestResponse.successResult(voList);
     }
 }