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

gic-store-api/src/main/java/com/gic/store/dto/StoreSearchDTO.java

@@ -14,6 +14,7 @@ public class StoreSearchDTO implements Serializable {
     private Integer enterpriseId;
     private String storeIds;
     private String storeInfoIds;
+    private Integer storeBrandId;
     private String searchJson;
     private Integer currentPage=1;
     private Integer pageSize=20;
@@ -129,4 +130,12 @@ public class StoreSearchDTO implements Serializable {
     public void setRegionId(Integer regionId) {
         this.regionId = regionId;
     }
+
+    public Integer getStoreBrandId() {
+        return storeBrandId;
+    }
+
+    public void setStoreBrandId(Integer storeBrandId) {
+        this.storeBrandId = storeBrandId;
+    }
 }

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

@@ -876,6 +876,10 @@ public class StoreApiServiceImpl implements StoreApiService {
             json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STOREINFOID.getField(), OperateEnum.OPERATE_ARR_CONTAIN, storeSearchDTO.getStoreInfoIds());
             jsonObjectList.add(json);
         }
+        if(storeSearchDTO.getStoreBrandId() != null){
+            json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STOREBRANDIDLIST.getField(), OperateEnum.OPERATE_ARR_CONTAIN, storeSearchDTO.getStoreBrandId());
+            jsonObjectList.add(json);
+        }
         if(StringUtils.isNotBlank(storeSearchDTO.getSearchJson())){
             ServiceResponse<JSONObject> jsonObjectServiceResponse = this.parseStoreSelectJson(storeSearchDTO.getSearchJson());
             if(jsonObjectServiceResponse.isSuccess()){