feat：门店过期统一修改

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

@@ -199,14 +199,19 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
 
     @Override
     public boolean enterpriseIsOver(String enterpriseId) {
-        if (StringUtils.isEmpty(enterpriseId)) {
-            return true;
-        }
         EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(enterpriseId);
-        if (enterprise == null || enterprise.getExpireTime() == null) {
+        if (enterprise == null || enterprise.getStatus() != 1) {
             return true;
         }
-        return enterprise.getExpireTime().getTime() <= System.currentTimeMillis();
+        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;
+        }
     }
 
     @Override

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

@@ -337,24 +337,6 @@ public class StaffController extends WebBaseController {
         return resultResponse(HaoBanErrCode.ERR_1, b);
     }
 
-    //获取门店详情
-    public boolean isEnterpriseOver(String eid) {
-        com.gic.enterprise.api.dto.EnterpriseDTO enterprise = enterpriseService.getEnterpriseByEid(eid);
-        if (enterprise == null) {
-            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;
-        }
-
-    }
-
     /**
      * 成员关联关系搜索接口
      *
@@ -373,7 +355,7 @@ public class StaffController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_10010);
         }
         List<String> enterpriseIds = list.stream().filter(dto -> {
-            boolean over = isEnterpriseOver(dto.getEnterpriseId());
+            boolean over = wxEnterpriseApiService.enterpriseIsOver(dto.getEnterpriseId());
             return !over;
         }).map(EnterpriseDetailDTO::getEnterpriseId).collect(Collectors.toList());
 
@@ -403,10 +385,8 @@ public class StaffController extends WebBaseController {
                         clerkInfoVo.setStoreName(store.getStoreName());
 
                     }
-
                 });
             }
-
         }
         return resultResponse(HaoBanErrCode.ERR_1, retList);
     }

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

@@ -652,16 +652,6 @@ public class ClerkController extends WebBaseController {
         return resultResponse(HaoBanErrCode.ERR_1, count);
     }
 
-    //获取门店详情
-    public boolean isEnterpriseOver(String eid) {
-
-        EnterpriseDTO enterprise = enterpriseService.getEnterpriseByEid(eid);
-        if (enterprise == null || enterprise.getExpireTime() == null) {
-            return false;
-        }
-        return enterprise.getExpireTime().getTime() <= System.currentTimeMillis();
-
-    }
 
     //精确查，根据手机号或者code，查找
     @RequestMapping("query-clerk-list-by-code")
@@ -677,9 +667,9 @@ public class ClerkController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_1);
         }
         List<String> enterpriseIdList = list.stream().filter(s -> {
-            boolean over = isEnterpriseOver(s.getEnterpriseId());
+            boolean over = wxEnterpriseApiService.enterpriseIsOver(s.getEnterpriseId());
             return !over;
-        }).map(s -> s.getEnterpriseId()).collect(Collectors.toList());
+        }).map(EnterpriseDetailDTO::getEnterpriseId).collect(Collectors.toList());
         List<String> storeIds = wxEnterpriseRelatedApiService.listStoreIdByWxEnterpriseId(wxEnterpriseId);
         List<ClerkDTO> clerkList = clerkNewService.listClerkByEnterpriseIdAndSearch(enterpriseIdList, storeIds, keyword);
         List<ClerkStoreVO> clerkStoreList = buildClerkRelation(clerkList, enterpriseIdList);
@@ -705,7 +695,7 @@ public class ClerkController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_1);
         }
         List<String> enterpriseIdList = list.stream().filter(s -> {
-            boolean over = isEnterpriseOver(s.getEnterpriseId());
+            boolean over = wxEnterpriseApiService.enterpriseIsOver(s.getEnterpriseId());
             return !over;
         }).map(s -> s.getEnterpriseId()).collect(Collectors.toList());
         List<String> storeIds = wxEnterpriseRelatedApiService.listStoreIdByWxEnterpriseId(wxEnterpriseId);
@@ -1220,7 +1210,7 @@ public class ClerkController extends WebBaseController {
             return RestResponse.successResult();
         }
         List<String> enterpriseIdList = list.stream().filter(s -> {
-            boolean over = isEnterpriseOver(s.getEnterpriseId());
+            boolean over = wxEnterpriseApiService.enterpriseIsOver(s.getEnterpriseId());
             return !over;
         }).map(s -> s.getEnterpriseId()).collect(Collectors.toList());
         List<String> storeIds = wxEnterpriseRelatedApiService.listStoreIdByWxEnterpriseId(qo.getWxEnterpriseId());

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

@@ -10,10 +10,8 @@ import com.gic.dict.api.dto.CityDTO;
 import com.gic.dict.api.dto.CountyDTO;
 import com.gic.dict.api.dto.GlobalDictMap;
 import com.gic.dict.api.dto.ProvinceDTO;
-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.StoreService;
 import com.gic.haoban.common.anno.IgnoreLogin;
 import com.gic.haoban.common.utils.HaobanResponse;
@@ -59,9 +57,9 @@ public class StoreController extends WebBaseController {
     @Autowired
     private StaffClerkRelationApiService staffClerkRelationApiService;
     @Autowired
-    private EnterpriseService enterpriseService;
-    @Autowired
     private StaffApiService staffApiService;
+    @Autowired
+    private WxEnterpriseApiService wxEnterpriseApiService;
 
     /**
      * 会员小程序-门店列表
@@ -96,12 +94,13 @@ public class StoreController extends WebBaseController {
         String storeId = mainDTO == null ? "" : mainDTO.getStoreId();
 
         for (StaffClerkRelationDTO staffClerkRelationDTO : bindRelationList) {
-            boolean enterpriseOver = isEnterpriseOver(staffClerkRelationDTO.getStoreId());
+            String enterpriseId = staffClerkRelationDTO.getEnterpriseId();
+            boolean enterpriseOver = wxEnterpriseApiService.enterpriseIsOver(enterpriseId);
             if (enterpriseOver) {
-                logger.info("该企业过期了：{},{},{}", staffId, staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getStoreId());
+                logger.info("该企业过期了：{},{},{}", staffId, enterpriseId, staffClerkRelationDTO.getStoreId());
                 continue;
             }
-            ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode());
+            ClerkDTO clerk = clerkService.getClerkByClerkCode(enterpriseId, staffClerkRelationDTO.getClerkCode());
             if (clerk == null) {
                 continue;
             }
@@ -318,26 +317,4 @@ 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;
-        }
-    }
-
-
 }