商户停用

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

@@ -133,7 +133,7 @@ public class StoreController extends WebBaseController {
                     continue ;
                 }
             }else {
-                boolean enterpriseOver = isEnterpriseOver2(enterprsieId);
+                boolean enterpriseOver = isEnterpriseOver(enterprsieId);
                 if (enterpriseOver) {
                     logger.info("该企业过期,{}", staffId, enterprsieId);
                     map.put(enterprsieId, false) ;
@@ -373,28 +373,8 @@ public class StoreController extends WebBaseController {
         return resultResponse(HaoBanErrCode.ERR_1, vo);
     }
 
-    //获取门店详情
-    public boolean isEnterpriseOver(String storeId) {
-        StoreDTO store = storeService.getStore(storeId);
-        if (store == null) {
-            return true;
-        }
-        EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(store.getEnterpriseId());
-        if (enterprise == null || enterprise.getStatus() != 1) {
-            return true;
-        }
-        if (enterprise.getExpireTime() == null) {
-            if (enterprise.getEnabledState() == null) {
-                return false;
-            } else {
-                return enterprise.getEnabledState() != 1;
-            }
-        } else {
-            return enterprise.getExpireTime().getTime() <= System.currentTimeMillis() || enterprise.getEnabledState() != 1;
-        }
-    }
     
-    public boolean isEnterpriseOver2(String enterpriseId) {
+    public boolean isEnterpriseOver(String enterpriseId) {
         EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(enterpriseId);
         if (enterprise == null || enterprise.getStatus() != 1) {
             return true;