|  |  | @ -48,6 +48,7 @@ import org.springframework.stereotype.Service; | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  | import javax.annotation.Resource; | 
			
		
	
		
			
				
					|  |  |  | import java.text.SimpleDateFormat; | 
			
		
	
		
			
				
					|  |  |  | import java.util.ArrayList; | 
			
		
	
		
			
				
					|  |  |  | import java.util.HashMap; | 
			
		
	
		
			
				
					|  |  |  | import java.util.List; | 
			
		
	
		
			
				
					|  |  |  | import java.util.Map; | 
			
		
	
	
		
			
				
					|  |  | @ -352,8 +353,15 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { | 
			
		
	
		
			
				
					|  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  |         List<GetTemplateListResultDTO> resultList = (List<GetTemplateListResultDTO>) mapToResult.getData(); | 
			
		
	
		
			
				
					|  |  |  |         return resultList; | 
			
		
	
		
			
				
					|  |  |  |         //List<CustomerTemplateListResultDTO> list = ConvertUtils.sourceToTarget(resultList, CustomerTemplateListResultDTO.class);
 | 
			
		
	
		
			
				
					|  |  |  |         //return list;
 | 
			
		
	
		
			
				
					|  |  |  |         /*List<Object> resultList = (List<Object>) mapToResult.getData(); | 
			
		
	
		
			
				
					|  |  |  |         List<CustomerTemplateListResultDTO> list = new ArrayList<>(); | 
			
		
	
		
			
				
					|  |  |  |         //必须转换
 | 
			
		
	
		
			
				
					|  |  |  |         for(Object f:resultList){ | 
			
		
	
		
			
				
					|  |  |  |             JSONObject json = JSON.parseObject(f.toString()); | 
			
		
	
		
			
				
					|  |  |  |             CustomerTemplateListResultDTO ff = ConvertUtils.mapToEntity(json, CustomerTemplateListResultDTO.class); | 
			
		
	
		
			
				
					|  |  |  |             list.add(ff); | 
			
		
	
		
			
				
					|  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  |         return list;*/ | 
			
		
	
		
			
				
					|  |  |  |     } | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |     /** | 
			
		
	
	
		
			
				
					|  |  | @ -374,8 +382,14 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { | 
			
		
	
		
			
				
					|  |  |  |             logger.error("调用epmet_third服务获取客户小程序消息订阅模板数据失败"); | 
			
		
	
		
			
				
					|  |  |  |             throw new RenException(mapToResult.getCode()); | 
			
		
	
		
			
				
					|  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  |         List<CustomerTemplateListResultDTO> resultList = (List<CustomerTemplateListResultDTO>) mapToResult.getData(); | 
			
		
	
		
			
				
					|  |  |  |         List<CustomerTemplateListResultDTO> list = ConvertUtils.sourceToTarget(resultList, CustomerTemplateListResultDTO.class); | 
			
		
	
		
			
				
					|  |  |  |         List<Object> resultList = (List<Object>) mapToResult.getData(); | 
			
		
	
		
			
				
					|  |  |  |         List<CustomerTemplateListResultDTO> list = new ArrayList<>(); | 
			
		
	
		
			
				
					|  |  |  |         //必须转换
 | 
			
		
	
		
			
				
					|  |  |  |         for(Object f:resultList){ | 
			
		
	
		
			
				
					|  |  |  |             JSONObject json = JSON.parseObject(f.toString()); | 
			
		
	
		
			
				
					|  |  |  |             CustomerTemplateListResultDTO ff = ConvertUtils.mapToEntity(json, CustomerTemplateListResultDTO.class); | 
			
		
	
		
			
				
					|  |  |  |             list.add(ff); | 
			
		
	
		
			
				
					|  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  |         return list; | 
			
		
	
		
			
				
					|  |  |  |     } | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
	
		
			
				
					|  |  | 
 |