删除商户停用的代码

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

@@ -18,12 +18,9 @@ import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
-import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
-import com.gic.enterprise.api.dto.EnterpriseUsingPermissionDto;
 import com.gic.enterprise.api.service.EnterpriseService;
-import com.gic.enterprise.api.service.EnterpriseUseForbidService;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.MiniprogramSettingDTO;
@@ -75,8 +72,6 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
     @Autowired
     private Config config;
     @Autowired
-    private EnterpriseUseForbidService enterpriseUseForbidService;
-    @Autowired
     private WxEnterpriseRelatedMapper wxEnterpriseRelatedMapper;
 
     @Override
@@ -263,7 +258,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         log.info("企微关联数={}，{}" ,count ,JSON.toJSONString(list));
         String msg = "好办服务已到期" ;
         if (count == 1) {
-            List<EnterpriseUsingPermissionDto>  enList =  this.enterpriseUseForbidService.selectEnterprisePermissionByEnterpriseId(list.get(0).getEnterpriseId()) ;
+          /*  List<EnterpriseUsingPermissionDto>  enList =  this.enterpriseUseForbidService.selectEnterprisePermissionByEnterpriseId(list.get(0).getEnterpriseId()) ;
             log.info("企微商户状态={}",JSON.toJSONString(list));
             if(CollectionUtils.isNotEmpty(list)) {
                 for(EnterpriseUsingPermissionDto dto : enList) {
@@ -272,7 +267,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
                         break ;
                     }
                 }
-            }
+            }*/
             return ServiceResponse.failure("2000", msg);
         } else {
             return ServiceResponse.failure("3000", msg);
@@ -286,7 +281,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
 
     @Override
     public boolean enterpriseIsOver(String enterpriseId) {
-        try {
+       /* try {
             log.info("是否停用查询={}", enterpriseId);
             Integer code = this.enterpriseUseForbidService.selectPermissionStatus(enterpriseId, "haoban-3");
             log.info("是否停用={},{}", enterpriseId, code);
@@ -296,7 +291,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
             }
         } catch (Exception e) {
             e.printStackTrace();
-        }
+        }*/
         EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(enterpriseId);
         if (enterprise == null || enterprise.getStatus() != 1) {
             return true;

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -182,7 +182,6 @@
     <dubbo:reference id="storeWidgetService"
                      interface="com.gic.enterprise.api.service.StoreWidgetService" timeout="10000"
                      retries="0" check="false"/>
-   <dubbo:reference interface="com.gic.enterprise.api.service.EnterpriseUseForbidService" id="enterpriseUseForbidService"/>                  
    <dubbo:reference id="memberTagOpenApiService" interface="com.gic.member.tag.api.service.MemberTagOpenApiService" timeout="10000" retries="0" check="false"/>
    <dubbo:reference id="memberClerkApiService" interface="com.gic.member.api.service.MemberClerkApiService" timeout="10000" retries="0" check="false"/>                  
 

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

@@ -27,7 +27,6 @@ import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.dto.StorePhotoDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
-import com.gic.enterprise.api.service.EnterpriseUseForbidService;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.common.anno.IgnoreLogin;
 import com.gic.haoban.common.utils.HaobanResponse;
@@ -85,8 +84,6 @@ public class StoreController extends WebBaseController {
     private StaffApiService staffApiService;
     @Autowired
     private WxEnterpriseApiService wxEnterpriseApiService;
-    @Autowired
-    private EnterpriseUseForbidService enterpriseUseForbidService ;
 
     /**
      * 会员小程序-门店列表
@@ -136,14 +133,14 @@ public class StoreController extends WebBaseController {
                     map.put(enterprsieId, false) ;
                     continue;
                 }
-                Integer code =  this.enterpriseUseForbidService.selectPermissionStatus(enterprsieId, "haoban-3") ;
+          /*      Integer code =  this.enterpriseUseForbidService.selectPermissionStatus(enterprsieId, "haoban-3") ;
                 logger.info("是否停用={},{}",enterprsieId,code);
                 // 不能用
                 if(!(code ==0 || code==1)) {
                     logger.info("该企业过期,{}", staffId, enterprsieId);
                     map.put(enterprsieId, false) ;
                     continue;
-                }
+                }*/
             }
             map.put(enterprsieId, true) ;
             ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode());

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -19,7 +19,6 @@
     <!--<dubbo:registry address="zookeeper://115.159.182.172:2199" protocol="dubbo" id="remoteAdd"/>-->
     <!--<dubbo:registry address="zookeeper://localhost:2181|zookeeper://115.159.182.172:2199" protocol="dubbo"/>-->
     
-    <dubbo:reference interface="com.gic.enterprise.api.service.EnterpriseUseForbidService" id="enterpriseUseForbidService"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService" id="staffDepartmentRelatedApiService"/>
 	<dubbo:reference interface="com.gic.clerk.api.service.ClerkService" id="clerkService"/>
 	<dubbo:reference interface="com.gic.haoban.data.api.service.HaobanDataApiService" id="haobanDataApiService"/>