服务到期

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

 package com.gic.haoban.manage.web.controller;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
@@ -799,8 +796,17 @@ public class WxEnterpriseInfoController extends WebBaseController {
         if (StringUtils.isBlank(enterpriseId)) {
             return RestResponse.failure("-701", "参数缺失");
         }
-        List<EnterpriseUsingPermissionDto> list = enterpriseUseForbidService.selectUsingEnterprisePermissionByEnterpriseId(enterpriseId);
-        List<EnterpriseUsingPermissionVO> voList = EntityUtil.changeEntityListByJSON(EnterpriseUsingPermissionVO.class, list);
+        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.after(new Date())) {
+                vo.setStatus(-1);
+            }
+            return vo;
+        }).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删除
     private Integer status;
     //商户功能开始时间
     private Date serviceStartDate;