Merge branch 'master-xgh-好办停用' into 'developer'

好办停用

See merge request !218

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseApiServiceImpl.java

@@ -292,14 +292,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         log.info("企微关联数={}，{}", count, JSON.toJSONString(list));
         String msg = "好办服务已到期";
         if (count == 1) {
-            ServiceResponse<EnterpriseUsingPermissionDto> resp =  this.enterpriseUseForbidService.getPermisssionByCode(list.get(0).getEnterpriseId(), EnterpriseServiceEnum.HAO_BAN.getRightMenuCode()) ;
-            log.info("返回权限信息={}",JSON.toJSONString(resp));
-            if(resp.isSuccess()) {
-                EnterpriseUsingPermissionDto dto = resp.getResult() ;
-                if(null != dto.getServiceEndDate() && 0!=dto.getStatus() && 1!=dto.getStatus()) {
-                    msg = "好办服务已于"+DateUtil.dateToStr(dto.getServiceEndDate(), "yyyy-MM-dd")+"到期" ;
-                }
-            }
+            msg = this.getEndDate(list.get(0).getEnterpriseId()) ;
             return ServiceResponse.failure("2000", msg);
         } else {
             boolean flag = false ;
@@ -499,8 +492,28 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         Integer code =  this.enterpriseUseForbidService.selectPermissionStatus(eid,EnterpriseServiceEnum.HAO_BAN.getRightMenuCode()) ;
         log.info("好办是否到期停用={},{}",eid,code);
         if(code ==0 || code==1) {
+            ServiceResponse<EnterpriseUsingPermissionDto> resp = this.enterpriseUseForbidService.getPermisssionByCode(eid, EnterpriseServiceEnum.HAO_BAN.getRightMenuCode()) ;
+            log.info("返回权限信息={}",JSON.toJSONString(resp));
+            if(resp.isSuccess()) {
+                EnterpriseUsingPermissionDto dto = resp.getResult() ;
+                if(null != dto.getServiceEndDate() && dto.getServiceEndDate().after(new Date())) {
+                    return false ;
+                }
+            }
             return false ;
         }
         return true ;
     }
+    
+    private String getEndDate(String enterpriseId) {
+        ServiceResponse<EnterpriseUsingPermissionDto> resp =  this.enterpriseUseForbidService.getPermisssionByCode(enterpriseId, EnterpriseServiceEnum.HAO_BAN.getRightMenuCode()) ;
+        log.info("返回权限信息={}",JSON.toJSONString(resp));
+        if(resp.isSuccess()) {
+            EnterpriseUsingPermissionDto dto = resp.getResult() ;
+            if(null != dto.getServiceEndDate() && ( dto.getServiceEndDate().after(new Date()) ||  (dto.getStatus()!=0 && dto.getStatus()!=1)) ) {
+                return  "好办服务已于"+DateUtil.dateToStr(dto.getServiceEndDate(), "yyyy-MM-dd")+"到期" ;
+            }
+        }
+        return "好办服务已到期" ;
+    }
 }

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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSON;
+import com.gic.api.base.commons.ServiceResponse;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
@@ -26,6 +27,7 @@ import com.gic.dict.api.dto.GlobalDictMap;
 import com.gic.dict.api.dto.ProvinceDTO;
 import com.gic.enterprise.api.constant.EnterpriseServiceEnum;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
+import com.gic.enterprise.api.dto.EnterpriseUsingPermissionDto;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.dto.StorePhotoDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
@@ -372,6 +374,14 @@ public class StoreController extends WebBaseController {
         Integer code =  this.enterpriseUseForbidService.selectPermissionStatus(enterpriseId,EnterpriseServiceEnum.HAO_BAN.getRightMenuCode()) ;
         logger.info("好办是否到期停用={},{}",enterpriseId,code);
         if(code ==0 || code==1) {
+            ServiceResponse<EnterpriseUsingPermissionDto> resp = this.enterpriseUseForbidService.getPermisssionByCode(enterpriseId, EnterpriseServiceEnum.HAO_BAN.getRightMenuCode()) ;
+            logger.info("返回权限信息={}",JSON.toJSONString(resp));
+            if(resp.isSuccess()) {
+                EnterpriseUsingPermissionDto dto = resp.getResult() ;
+                if(null != dto.getServiceEndDate() && dto.getServiceEndDate().after(new Date())) {
+                    return false ;
+                }
+            }
             return false ;
         }
         return true ;