|  | @@ -18,6 +18,7 @@ import com.yonge.cooleshow.admin.enums.OrderStatisticalEnum;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.admin.service.*;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.mbg.mapper.*;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.mbg.model.*;
 | 
	
		
			
				|  |  | +import lombok.extern.slf4j.Slf4j;
 | 
	
		
			
				|  |  |  import org.springframework.beans.factory.annotation.Autowired;
 | 
	
		
			
				|  |  |  import org.springframework.stereotype.Service;
 | 
	
		
			
				|  |  |  import org.springframework.transaction.annotation.Transactional;
 | 
	
	
		
			
				|  | @@ -40,6 +41,7 @@ import java.util.stream.Collectors;
 | 
	
		
			
				|  |  |   * Created by macro on 2018/10/11.
 | 
	
		
			
				|  |  |   */
 | 
	
		
			
				|  |  |  @Service
 | 
	
		
			
				|  |  | +@Slf4j
 | 
	
		
			
				|  |  |  public class OmsOrderServiceImpl implements OmsOrderService {
 | 
	
		
			
				|  |  |      @Autowired
 | 
	
		
			
				|  |  |      private OmsOrderMapper orderMapper;
 | 
	
	
		
			
				|  | @@ -92,18 +94,23 @@ public class OmsOrderServiceImpl implements OmsOrderService {
 | 
	
		
			
				|  |  |          List<Long> schoolIds = list.stream().filter(o->o.getSourceType() ==2).map(OmsOrder::getMemberId).collect(Collectors.toList());
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          if (!CollectionUtils.isEmpty(schoolIds)) {
 | 
	
		
			
				|  |  | -            HttpResponseResult<List<SchoolDto>> schoolDtoHttpResponseResult = webFeignService.schoolListByIds(schoolIds);
 | 
	
		
			
				|  |  | -            if (schoolDtoHttpResponseResult.getCode() == 200 && schoolDtoHttpResponseResult.getStatus()) {
 | 
	
		
			
				|  |  | -                Map<Long, SchoolDto> schoolDtoMap = schoolDtoHttpResponseResult.getData().stream().collect(Collectors.toMap(SchoolDto::getId, o -> o));
 | 
	
		
			
				|  |  | -                list.forEach(o->{
 | 
	
		
			
				|  |  | -                    if (o.getSourceType() == 2) {
 | 
	
		
			
				|  |  | -                        SchoolDto schoolDto = schoolDtoMap.get(o.getMemberId());
 | 
	
		
			
				|  |  | -                        if (schoolDto != null) {
 | 
	
		
			
				|  |  | -                            o.setMemberUsername(schoolDto.getName());
 | 
	
		
			
				|  |  | +            try {
 | 
	
		
			
				|  |  | +                HttpResponseResult<List<SchoolDto>> schoolDtoHttpResponseResult = webFeignService.schoolListByIds(schoolIds);
 | 
	
		
			
				|  |  | +                if (schoolDtoHttpResponseResult.getCode() == 200 && schoolDtoHttpResponseResult.getStatus()) {
 | 
	
		
			
				|  |  | +                    Map<Long, SchoolDto> schoolDtoMap = schoolDtoHttpResponseResult.getData().stream().collect(Collectors.toMap(SchoolDto::getId, o -> o));
 | 
	
		
			
				|  |  | +                    list.forEach(o->{
 | 
	
		
			
				|  |  | +                        if (o.getSourceType() == 2) {
 | 
	
		
			
				|  |  | +                            SchoolDto schoolDto = schoolDtoMap.get(o.getMemberId());
 | 
	
		
			
				|  |  | +                            if (schoolDto != null) {
 | 
	
		
			
				|  |  | +                                o.setMemberUsername(schoolDto.getName());
 | 
	
		
			
				|  |  | +                            }
 | 
	
		
			
				|  |  |                          }
 | 
	
		
			
				|  |  | -                    }
 | 
	
		
			
				|  |  | -                });
 | 
	
		
			
				|  |  | +                    });
 | 
	
		
			
				|  |  | +                }
 | 
	
		
			
				|  |  | +            } catch (Exception e) {
 | 
	
		
			
				|  |  | +                log.error("查询学校信息失败", e);
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          return list;
 |