门店标签兼容

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -98,6 +98,8 @@ public class StoreApiServiceImpl implements StoreApiService {
     private StoreIndexLogService storeIndexLogService;
     @Autowired
     private ClerkApiService clerkApiService;
+    @Autowired
+    private StoreTagService storeTagService;
 
     private Map<String, BulkUpdateStoreStrtegy> storeStrtegyMap = new ConcurrentHashMap<>();
 
@@ -533,10 +535,45 @@ public class StoreApiServiceImpl implements StoreApiService {
             List<JSONObject> jsonObjectList = new ArrayList<>();
             for(int j =0 ;j< list.size(); j++){
                 JSONObject data = list.getJSONObject(j);
-                data.put("type", "data");
-                String compute = data.getJSONObject("data").getString("compute");
-                if(OperateEnum.OPERATE_BETWEEN.getValue().equals(compute)){
-                    data.getJSONObject("data").put("value", data.getJSONObject("data").getString("value").replaceAll(" ", ","));
+                String key = data.getString("key");
+                if(StoreESFieldsEnum.STORETAG.getField().equals(key)){
+                    JSONObject json = new JSONObject();
+                    json.put("type", OperateEnum.OPERATE_OR.getValue());
+                    List<JSONObject> listTag = new ArrayList<>();
+                    String[] valueArr = data.getString("value").split(" ");
+                    for(String s : valueArr){
+                        JSONObject _json = new JSONObject();
+                        _json.put("type", OperateEnum.OPERATE_AND.getValue());
+                        List<JSONObject> _list = new ArrayList<>();
+                        TabStoreTag storeTag = this.storeTagService.getById(Integer.valueOf(s));
+                        if(storeTag == null) continue;
+                        StoreWidgetDTO storeWidget = this.storeWidgetService.getStoreWidget(storeTag.getStoreWidgetId());
+                        if(storeWidget == null) continue;
+                        if(StringUtils.isNotBlank(storeWidget.getAuthSearchParam()) && !"{}".equals(storeWidget.getAuthSearchParam())){
+                            ServiceResponse<JSONObject> response = this.parseStoreSelectJson(storeWidget.getAuthSearchParam());
+                            if(response.isSuccess() && response.getResult() != null){
+                                _list.add(response.getResult());
+                            }
+                        }
+                        if(StringUtils.isNotBlank(storeWidget.getSearchParam()) && !"{}".equals(storeWidget.getSearchParam())){
+                            ServiceResponse<JSONObject> response = this.parseStoreSelectJson(storeWidget.getSearchParam());
+                            if(response.isSuccess() && response.getResult() != null){
+                                _list.add(response.getResult());
+                            }
+                        }
+                        _json.put("list", _list);
+                        listTag.add(_json);
+                    }
+                    json.put("list", listTag);
+                    list.getJSONObject(j).clear();
+                    list.getJSONObject(j).put("type", OperateEnum.OPERATE_OR.getValue());
+                    list.getJSONObject(j).put("list", listTag);
+                }else {
+                    data.put("type", "data");
+                    String compute = data.getJSONObject("data").getString("compute");
+                    if(OperateEnum.OPERATE_BETWEEN.getValue().equals(compute)){
+                        data.getJSONObject("data").put("value", data.getJSONObject("data").getString("value").replaceAll(" ", ","));
+                    }
                 }
                 jsonObjectList.add(data);
             }