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

好办停用

See merge request !215

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

@@ -279,30 +279,40 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
     public ServiceResponse<Boolean> isStopHaoban(String corpId) {
         TabHaobanWxEnterprise entity = this.wxEnterpriseService.getEnterpriseBycorpId(corpId);
         if (null == entity) {
+            log.info("企微查询不到corpid={}",corpId);
             return ServiceResponse.failure("9999", "企微企业信息不存在");
         }
         String wxEnterpriseId = entity.getWxEnterpriseId();
         List<TabHaobanWxEnterpriseRelated> list = this.wxEnterpriseRelatedMapper.listByWxenterpriseId(wxEnterpriseId);
         if (CollectionUtils.isEmpty(list)) {
+            log.info("企微无关联gic商户,wxEnterpriseId={}",wxEnterpriseId);
             return ServiceResponse.failure("1000", "无关联商户");
         }
         int count = list.size();
         log.info("企微关联数={}，{}", count, JSON.toJSONString(list));
         String msg = "好办服务已到期";
         if (count == 1) {
-            List<EnterpriseUsingPermissionDto>  enList =  this.enterpriseUseForbidService.selectEnterprisePermissionByEnterpriseId(list.get(0).getEnterpriseId()) ;
-            log.info("企微商户状态={}",JSON.toJSONString(list));
-            if(CollectionUtils.isNotEmpty(list)) {
-                for(EnterpriseUsingPermissionDto dto : enList) {
-                    if(null != dto.getRightMenuCode() && dto.getRightMenuCode().equals(EnterpriseServiceEnum.HAO_BAN.getRightMenuCode()) && null != dto.getServiceEndDate()) {
-                        msg = "好办服务已于"+DateUtil.dateToStr(dto.getServiceEndDate(), "yyyy-MM-dd")+"到期" ;
-                        break ;
-                    }
+            ServiceResponse<EnterpriseUsingPermissionDto> resp =  this.enterpriseUseForbidService.getPermisssionByCode(list.get(0).getEnterpriseId(), EnterpriseServiceEnum.GUANG_YUN.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")+"到期" ;
                 }
             }
             return ServiceResponse.failure("2000", msg);
         } else {
-            return ServiceResponse.failure("3000", msg);
+            boolean flag = false ;
+            for(TabHaobanWxEnterpriseRelated item : list) {
+                boolean isStop = this.haobanIsStop(item.getEnterpriseId()) ;
+                if(!isStop) {
+                    flag = true ;
+                }
+            }
+            if(!flag) {
+                return ServiceResponse.failure("3000", msg);
+            }
+            return ServiceResponse.success() ;
         }
     }
 
@@ -310,20 +320,11 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
     public void update(WxEnterpriseDTO enterpriseDTO) {
         wxEnterpriseService.update(enterpriseDTO);
     }
-
+    
+    // 返回true说明已过期
     @Override
     public boolean enterpriseIsOver(String enterpriseId) {
-        try {
-            Integer code = this.enterpriseUseForbidService.selectPermissionStatus(enterpriseId, EnterpriseServiceEnum.HAO_BAN.getRightMenuCode());
-            log.info("是否停用查询={},{}", enterpriseId, code);
-            // 不能用
-            if (!(code == 0 || code == 1)) {
-                return true;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return false ;
+       return haobanIsStop(enterpriseId) ;
     }
 
     @Override
@@ -493,4 +494,13 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         map.put("enterpriseId", enterpriseId) ;
         this.haobanCommonMQApiService.putCommonMessage(dto);
     }
+    
+    private boolean haobanIsStop(String eid) {
+        Integer code =  this.enterpriseUseForbidService.selectPermissionStatus(eid,EnterpriseServiceEnum.HAO_BAN.getRightMenuCode()) ;
+        log.info("好办是否到期停用={},{}",eid,code);
+        if(code ==0 || code==1) {
+            return false ;
+        }
+        return true ;
+    }
 }