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

好办停用

See merge request !217

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

@@ -292,7 +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.GUANG_YUN.getRightMenuCode()) ;
+            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() ;

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

@@ -112,14 +112,10 @@ public class StoreController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_1);
         }
         List<String> enterpriseIdList = enterpriseList.stream().filter(dto->{
-            String enterprsieId = dto.getEnterpriseId() ;
-            Integer code =  this.enterpriseUseForbidService.selectPermissionStatus(enterprsieId, EnterpriseServiceEnum.HAO_BAN.getRightMenuCode()) ;
-            logger.info("是否停用={},{}",enterprsieId,code);
-            if(code ==0 || code==1) {
-                return true ;
-            }
-            return false ;
+            String enterpriseId = dto.getEnterpriseId() ;
+            return !this.haobanIsStop(enterpriseId);
         }).map(EnterpriseDetailDTO::getEnterpriseId).collect(Collectors.toList());
+        
         if (CollectionUtils.isEmpty(enterpriseIdList)) {
             logger.info("没有关联任何商户或商户都已停用：{}", wxEnterpriseId);
             return resultResponse(HaoBanErrCode.ERR_1);
@@ -371,4 +367,13 @@ public class StoreController extends WebBaseController {
         }
         return resultResponse(HaoBanErrCode.ERR_1, vo);
     }
+    
+    private boolean haobanIsStop(String enterpriseId) {
+        Integer code =  this.enterpriseUseForbidService.selectPermissionStatus(enterpriseId,EnterpriseServiceEnum.HAO_BAN.getRightMenuCode()) ;
+        logger.info("好办是否到期停用={},{}",enterpriseId,code);
+        if(code ==0 || code==1) {
+            return false ;
+        }
+        return true ;
+    }
 }