字段调整

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/StoreSearchUtils.java

@@ -96,12 +96,14 @@ public class StoreSearchUtils {
         if(StringUtils.isNotBlank(searchJson)){
             JSONObject json = JSON.parseObject(searchJson);
             StoreSearchQo storeSearchQo = json.getObject(StoreChannelEnum.OFFLINE.getChannel().toString(), StoreSearchQo.class);
+            StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
             if(storeSearchQo.getAll() == 1){
-                resultList = storeAuth.getStoreInfoIdList();
+                storeSearchDTO.setStoreInfoIds(StringUtils.join(storeAuth.getStoreInfoIdList().toArray(), " "));
             }else {
-                StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
+                if(StringUtils.isNotBlank(storeSearchQo.getStoreIds())){
+                    storeSearchDTO.setStoreInfoIds(storeSearchQo.getStoreIds().replaceAll(",",  " "));
+                }
                 storeSearchDTO.setEnterpriseId(enterpriseId);
-                storeSearchDTO.setStoreInfoIds(StringUtils.isBlank(storeSearchQo.getStoreIds()) ? null : storeSearchQo.getStoreIds().replaceAll(",",  " "));
                 storeSearchDTO.setStoreGroupIds(StringUtils.isBlank(storeSearchQo.getStoreGroupIds()) ? null : storeSearchQo.getStoreGroupIds().replaceAll(",",  " "));
                 storeSearchDTO.setRegionIds(StringUtils.isBlank(storeSearchQo.getRegion()) ? null : storeSearchQo.getRegion().replaceAll(",",  " "));
                 storeSearchDTO.setStoreTypes(StringUtils.isBlank(storeSearchQo.getStoreType()) ? null :storeSearchQo.getStoreType().replaceAll(",",  " "));
@@ -295,14 +297,41 @@ public class StoreSearchUtils {
             StoreSearchQo searchQo = JSON.parseObject(searchJson).getObject(channel.toString(), StoreSearchQo.class);
             log.info("getOnlineStoreIds:{},{}", searchJson, JSON.toJSONString(searchQo));
             if(searchQo != null){
-                if(searchQo.getAll() != 1){ //todo
+                if(searchQo.getAll() != 1){ //不是所有线上门店
                     if(StringUtils.isNotBlank(searchQo.getStoreGroupIds())){
-                        //资源类型
-                        //店招品牌
-                        List<String> onLineStoreList = new ArrayList<>();
+                        List<String> filter = filter(channel, searchQo, enterpriseId, key, Arrays.asList(searchQo.getStoreGroupIds().split(",")));
+                        list.addAll(filter);
+                    }
+                } else {
+                    onlineStoreAuth.getList().stream().forEach(s -> {
+                        if(s.getChannel() != null && s.getChannel().intValue() == channel.intValue()){
+                            if(CollectionUtils.isNotEmpty(s.getStoreIdList())){
+                                RedisUtil.setCache(key, 1, 10L, TimeUnit.MINUTES);
+                                List<String> filter = filter(channel, searchQo, enterpriseId, key, s.getStoreIdList());
+                                list.addAll(filter);
+                            }
+                        }
+                    });
+                }
+            }
+        } else {
+            if(CollectionUtils.isNotEmpty(onlineStoreAuth.getList())){
+                onlineStoreAuth.getList().stream().forEach(s -> {
+                    if(s.getChannel() != null && s.getChannel().intValue() == channel.intValue()){
+                        if(CollectionUtils.isNotEmpty(s.getStoreIdList())){
+                            RedisUtil.setCache(key, 1, 10L, TimeUnit.MINUTES);
+                            list.addAll(s.getStoreIdList());
+                        }
+                    }
+                });
+            }
+        }
+    }
+
+    private List<String> filter(Integer channel, StoreSearchQo searchQo, Integer enterpriseId, String key, List<String> onLineStoreIdList){
         if(StoreChannelEnum.WMMALL.getChannel().equals(channel)){
-                            List<WmStoreDTO> wmStoreDTOList = this.wmStoreApiService.listWmStore(Arrays.asList(searchQo.getStoreGroupIds().split(",")), null).getResult();
-                            onLineStoreList = wmStoreDTOList.stream().filter(wmStoreDTO -> {
+            List<WmStoreDTO> wmStoreDTOList = this.wmStoreApiService.listWmStore(onLineStoreIdList, null).getResult();
+            List<String> onLineStoreList = wmStoreDTOList.stream().filter(wmStoreDTO -> {
                 boolean resourceFlag = true;
                 if(StringUtils.isNotBlank(searchQo.getResourceType())){
                     if("1".equals(searchQo.getResourceType())){  //自有资源
@@ -325,25 +354,10 @@ public class StoreSearchUtils {
                 }
                 return resourceFlag || brandFlag;
             }).map(wmStoreDTO -> wmStoreDTO.getWmMallStoreId().toString()).collect(Collectors.toList());
-                            list.addAll(onLineStoreList);
             if(CollectionUtils.isNotEmpty(onLineStoreList)){
                 RedisUtil.setCache(key, 1, 10L, TimeUnit.MINUTES);
             }
-                        }
-                    }
-                }
-            }
-        } else {
-            if(CollectionUtils.isNotEmpty(onlineStoreAuth.getList())){
-                onlineStoreAuth.getList().stream().forEach(s -> {
-                    if(s.getChannel() != null && s.getChannel().intValue() == channel.intValue()){
-                        if(CollectionUtils.isNotEmpty(s.getStoreIdList())){
-                            RedisUtil.setCache(key, 1, 10L, TimeUnit.MINUTES);
-                            list.addAll(s.getStoreIdList());
-                        }
-                    }
-                });
-            }
+            return onLineStoreList;
         }
     }