获取商户可用的服务状态

haoban-manage3-service/src/test/java/MaterialReportServiceTest.java

@@ -66,9 +66,9 @@ public class MaterialReportServiceTest {
         MaterialReportDTO materialReportDTO = new MaterialReportDTO();
         materialReportDTO.setEnterpriseId(eid);
         materialReportDTO.setStaffId(staffId);
-        materialReportDTO.setReportType(MaterialReportType.WEEK.getCode());
+//        materialReportDTO.setReportType(MaterialReportType.WEEK.getCode());
         materialReportDTO.setRightMenuCodeList(Lists.newArrayList(EnterpriseServiceEnum.CONTENT.getRightMenuCode()));
-        materialReportService.handlerMaterialReport(materialReportDTO);
+//        materialReportService.handlerMaterialReport(materialReportDTO);
         materialReportDTO.setReportType(MaterialReportType.MONTH.getCode());
         materialReportService.handlerMaterialReport(materialReportDTO);
     }

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

@@ -797,7 +797,10 @@ public class WxEnterpriseInfoController extends WebBaseController {
             return RestResponse.failure("-701", "参数缺失");
         }
         List<EnterpriseUsingPermissionDto> list = enterpriseUseForbidService.selectEnterprisePermissionByEnterpriseId(enterpriseId);
-        List<EnterpriseUsingPermissionVO> voList = EntityUtil.changeEntityListByJSON(EnterpriseUsingPermissionVO.class, list);
+        List<EnterpriseUsingPermissionVO> voList = list.stream().map(x -> {
+            x.setStatus(x.isUsing() ? 0 : -1);
+            return EntityUtil.changeEntityByJSON(EnterpriseUsingPermissionVO.class, x);
+        }).collect(Collectors.toList());
         return RestResponse.successResult(voList);
     }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/EnterpriseUsingPermissionVO.java

@@ -16,7 +16,7 @@ public class EnterpriseUsingPermissionVO implements Serializable {
     private String moduleName;
     //菜单code
     private String rightMenuCode;
-    //商户功能状态 -1到期 0正常 1删除
+    //商户功能状态 -1到期 0正常
     private Integer status;
     //商户功能开始时间
     private Date serviceStartDate;