Skip to content

G
gic-data-cloud
Commit 1918b5fb by 陶光胜
Options

Merge branch 'developer' into 'master' 

Developer

See merge request !65
parents fc3f23a9 3f5f407d
Showing with 10 additions and 10 deletions
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/StoreSearchUtils.java
...@@ -104,22 +104,22 @@ public class StoreSearchUtils { ...@@ -104,22 +104,22 @@ public class StoreSearchUtils {
}else { }else {
StoreSearchDTO storeSearchDTO = new StoreSearchDTO(); StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
storeSearchDTO.setEnterpriseId(enterpriseId); storeSearchDTO.setEnterpriseId(enterpriseId);
storeSearchDTO.setStoreInfoIds(storeSearchQo.getStoreIds()); storeSearchDTO.setStoreInfoIds(storeSearchQo.getStoreIds().replaceAll(",", " "));
storeSearchDTO.setStoreGroupIds(storeSearchQo.getStoreGroupIds()); storeSearchDTO.setStoreGroupIds(storeSearchQo.getStoreGroupIds().replaceAll(",", " "));
storeSearchDTO.setRegionIds(storeSearchQo.getRegion()); storeSearchDTO.setRegionIds(storeSearchQo.getRegion().replaceAll(",", " "));
storeSearchDTO.setStoreTypes(storeSearchQo.getStoreType()); storeSearchDTO.setStoreTypes(storeSearchQo.getStoreType().replaceAll(",", " "));
storeSearchDTO.setStoreStatuss(storeSearchQo.getStoreStatus()); storeSearchDTO.setStoreStatuss(storeSearchQo.getStoreStatus().replaceAll(",", " "));
storeSearchDTO.setErpStatuss(storeSearchQo.getErpStatus()); storeSearchDTO.setErpStatuss(storeSearchQo.getErpStatus().replaceAll(",", " "));
storeSearchDTO.setStoreTags(storeSearchQo.getStoreTag()); storeSearchDTO.setStoreTags(storeSearchQo.getStoreTag().replaceAll(",", " "));
if(storeSearchQo.getAttentionStore() == 1){ if(storeSearchQo.getAttentionStore() == 1){
List<AttentionStoreDTO> result = this.storeAttentionApiService.pageStoreAttention(userId, enterpriseId, 1, Integer.MAX_VALUE).getResult().getResult(); List<AttentionStoreDTO> result = this.storeAttentionApiService.pageStoreAttention(userId, enterpriseId, 1, Integer.MAX_VALUE).getResult().getResult();
List<Integer> list = result.stream().map(t -> t.getStoreId()).collect(Collectors.toList()); List<Integer> list = result.stream().map(t -> t.getStoreId()).collect(Collectors.toList());
String storeInfoIds = StringUtils.join(list, ","); String storeInfoIds = StringUtils.join(list, " ");
storeSearchDTO.setStoreInfoIds(storeSearchDTO.getStoreInfoIds()+","+ storeInfoIds); storeSearchDTO.setStoreInfoIds(storeSearchDTO.getStoreInfoIds()+" "+ storeInfoIds);
} }
if(storeSearchQo.getTmpStore() == 0){ if(storeSearchQo.getTmpStore() == 0){
if(CollectionUtils.isNotEmpty(tempStoreIdList)){ if(CollectionUtils.isNotEmpty(tempStoreIdList)){
storeSearchDTO.setStoreInfoIdsOfNot(StringUtils.join(tempStoreIdList, ",")); storeSearchDTO.setStoreInfoIdsOfNot(StringUtils.join(tempStoreIdList, " "));
} }
} }
ServiceResponse<Page<StoreDTO>> pageServiceResponse = this.storeApiService.listStore(storeSearchDTO, 1, 20000); ServiceResponse<Page<StoreDTO>> pageServiceResponse = this.storeApiService.listStore(storeSearchDTO, 1, 20000);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment