Merge branch 'master-xgh-好办停用' into 'developer'

查询门店名称

See merge request !271

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

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.service.hm.impl;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -12,6 +13,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.UniqueIdUtils;
+import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.manage.api.dto.hm.HmLinkStoreDTO;
 import com.gic.haoban.manage.service.dao.mapper.hm.HmLinkStoreMapper;
 import com.gic.haoban.manage.service.entity.hm.TabHmLinkStore;
@@ -20,17 +23,26 @@ import com.gic.haoban.manage.service.service.hm.HmLinkStoreService;
 @Service("hmLinkStoreService")
 public class HmLinkStoreServiceImpl implements HmLinkStoreService {
     
-
     private static org.apache.logging.log4j.Logger log = LogManager.getLogger(HmLinkStoreService.class);
     
     @Autowired
     private HmLinkStoreMapper hmLinkStoreMapper;
+    @Autowired
+    private StoreService storeService ;
 
     @Override
     public List<HmLinkStoreDTO> listByLinkId(String wxEnterpriseId, String enterpriseId, Long linkId) {
         List<TabHmLinkStore> list = this.hmLinkStoreMapper.listByLinkId(linkId);
         if (CollectionUtils.isNotEmpty(list)) {
             List<HmLinkStoreDTO> storeList = EntityUtil.changeEntityListByJSON(HmLinkStoreDTO.class, list);
+            List<String> storeIdList = list.stream().map(dto->dto.getStoreId()).collect(Collectors.toList()) ;
+            List<StoreDTO> storeDTOList = this.storeService.queryStore(storeIdList);
+            Map<String,String> map = storeDTOList.stream().collect(Collectors.toMap(StoreDTO::getStoreId, StoreDTO::getStoreName,(k1,k2)->k1)) ;
+            for(HmLinkStoreDTO item : storeList) {
+                if(null != map.get(item.getStoreId())) {
+                    item.setStoreName(map.get((item.getStoreId())));
+                }
+            }
             return storeList;
         }
         return null;