商户停用

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

@@ -132,13 +132,7 @@ public class StoreController extends WebBaseController {
                     continue ;
                 }
             }else {
-                boolean enterpriseOver = isEnterpriseOver(enterprsieId);
-                if (enterpriseOver) {
-                    logger.info("该企业过期,{}", staffId, enterprsieId);
-                    map.put(enterprsieId, false) ;
-                    continue;
-                }
-               Integer code =  this.enterpriseUseForbidService.selectPermissionStatus(enterprsieId, EnterpriseServiceEnum.HAO_BAN.getRightMenuCode()) ;
+                Integer code =  this.enterpriseUseForbidService.selectPermissionStatus(enterprsieId, EnterpriseServiceEnum.HAO_BAN.getRightMenuCode()) ;
                 logger.info("是否停用={},{}",enterprsieId,code);
                 // 不能用
                 if(!(code ==0 || code==1)) {
@@ -322,7 +316,7 @@ public class StoreController extends WebBaseController {
             AuditDTO auditDTO = auditApiService.findByStoreIdAndChangeField(storeId, changeField);
             if (auditDTO == null) {
                 //为空，可继续提交审核
-                int i = auditApiService.save(1, wxEnterpriseId, enterpriseId, staffId, storeId, changeField, oldValue, newValue);
+                auditApiService.save(1, wxEnterpriseId, enterpriseId, staffId, storeId, changeField, oldValue, newValue);
             } else {
                 return resultResponse(HaoBanErrCode.ERR_400018);
             }
@@ -381,23 +375,4 @@ public class StoreController extends WebBaseController {
         }
         return resultResponse(HaoBanErrCode.ERR_1, vo);
     }
-
-    
-    public boolean isEnterpriseOver(String enterpriseId) {
-        EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(enterpriseId);
-        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;
-        }
-    }
-
-
 }