Merge remote-tracking branch 'origin/developer' into developer

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

@@ -331,7 +331,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                 // 活码的门店
                 List<HmLinkStoreDTO> storeList = this.hmLinkStoreService.listByLinkId(wxEnterpriseId, enterpriseId,
                         linkId);
-                this.setStoreAddress(enterpriseId, storeList);
+                this.setStoreAddress(wxEnterpriseId ,enterpriseId, storeList);
                 log.info("门店规则={},推荐门店列表={}", storeType, JSON.toJSONString(storeList));
                 HmLinkStoreSettingDTO cityStore = storeRuleObj.getObject("city_store", HmLinkStoreSettingDTO.class);
                 // 是否开启省市区门店查询
@@ -411,9 +411,12 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
         return ServiceResponse.success(retDTO);
     }
 
-    private void setStoreAddress(String enterpriseId, List<HmLinkStoreDTO> storeList) {
+    private void setStoreAddress(String wxEnterpriseId ,String enterpriseId, List<HmLinkStoreDTO> storeList) {
         if (CollectionUtils.isNotEmpty(storeList)) {
-            List<String> storeIdList = storeList.stream().map(dto -> dto.getStoreId()).collect(Collectors.toList());
+            // 过滤到达上线的门店
+            List<String> okStoreIdList =  this.hmQrcodeService.getHmStoreForWxa(wxEnterpriseId, enterpriseId) ;
+            log.info("storeId={}",okStoreIdList);
+            List<String> storeIdList = storeList.stream().filter(dto->okStoreIdList.contains(dto.getStoreId())).map(dto -> dto.getStoreId()).collect(Collectors.toList());
             String[] storeIds = new String[storeIdList.size()];
             for (int i = 0; i < storeIdList.size(); i++) {
                 storeIds[i] = storeIdList.get(i);