| 
														
															@@ -47,13 +47,14 @@ public class ResultMap extends HashMap<String, Object> { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         return r; 
														 | 
														
														 | 
														
															         return r; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } 
														 | 
														
														 | 
														
															     } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															-    public static ResultMap ok(Integer deviceType, Object data) { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+    public static ResultMap ok(Integer deviceType, Object data, String orderId) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         ResultMap r = new ResultMap(); 
														 | 
														
														 | 
														
															         ResultMap r = new ResultMap(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         r.put("code", HttpStatusEnum.SUCCESS.getCode()); 
														 | 
														
														 | 
														
															         r.put("code", HttpStatusEnum.SUCCESS.getCode()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         r.put("msg", HttpStatusEnum.SUCCESS.getMsg()); 
														 | 
														
														 | 
														
															         r.put("msg", HttpStatusEnum.SUCCESS.getMsg()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         HashMap<String, Object> dataMap = new HashMap<>(2); 
														 | 
														
														 | 
														
															         HashMap<String, Object> dataMap = new HashMap<>(2); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         dataMap.put("data", data); 
														 | 
														
														 | 
														
															         dataMap.put("data", data); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         dataMap.put("deviceType", deviceType); 
														 | 
														
														 | 
														
															         dataMap.put("deviceType", deviceType); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        dataMap.put("orderId", orderId); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         r.put("data", dataMap); 
														 | 
														
														 | 
														
															         r.put("data", dataMap); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         return r; 
														 | 
														
														 | 
														
															         return r; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } 
														 | 
														
														 | 
														
															     } 
														 |