Merge branch 'feature/xgh/20241月迭代' into 'developer'

品牌过期校验

See merge request !1648

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

@@ -717,7 +717,7 @@ public class WxStaffController extends WebBaseController {
         }
         List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
         if (list == null || list.isEmpty()) {
-            return resultResponse(HaoBanErrCode.ERR_1);
+            return resultResponse(HaoBanErrCode.ERR_0, "未关联gic商户");
         }
         List<String> enterpriseIdList = list.stream().filter(s -> {
             boolean over = wxEnterpriseApiService.haobanIsStop(s.getEnterpriseId());
@@ -728,6 +728,9 @@ public class WxStaffController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_1, new ArrayList<>());
         }
         logger.info("查询到企微门店数={},{}", storeIds.size(), storeIds);
+        if(CollectionUtils.isEmpty(enterpriseIdList)) {
+            return resultResponse(HaoBanErrCode.ERR_0, "关联gic商户已过期");
+        }
         List<ClerkDTO> clerkList = new ArrayList<>();
         if (manageFlag == -1) {
             clerkList.addAll(clerkService.listClerkEnableHaoban(enterpriseIdList, keyword));
@@ -1569,7 +1572,7 @@ public class WxStaffController extends WebBaseController {
             logger.info("没有关联任何商户或商户都已停用：{}", wxEnterpriseId);
             return RestResponse.successResult();
         }
-
+        logger.info("关联的商户={}",enterpriseIdList);
         Map<String, EnterpriseDetailDTO> enterpriseTypeMap = enterpriseList.stream()
                 .collect(Collectors.toMap(dto -> dto.getEnterpriseId(), dto -> dto));
         bindRelationList = staffClerkRelationApiService.listBindCodeByStaffId(enterpriseIdList, staffId);