| 
					
				 | 
			
			
				@@ -233,11 +233,14 @@ public class BackgroundProcessingController extends BaseRESTfulController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Transactional(rollbackFor = Exception.class) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public RESTfulResult modifyOrderStatus(@RequestBody(required = false) Map<String,Object> map) throws Exception{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (map.get("orderNumber") != null && map.get("orderStatus") != null && map.get("toOrderStatus") != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            Map<String,Object> oMap = null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            Map<String,Object> oMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if(map.get("orderNumber").toString().length() < 8){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                return failed("修改失败:输入订单编号不能低于8位!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 oMap = backgroundProcessingMapper.getOrderInfoByOrderStatus(map); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } catch (Exception e) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                return failed("修改失败:订单编号不唯一"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                return failed("修改失败:订单编号不唯一!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if(oMap == null || oMap.get("orderId") == null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 return failed("修改失败:未找到运输订单!"); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -245,8 +248,9 @@ public class BackgroundProcessingController extends BaseRESTfulController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             oMap.put("toOrderStatus", map.get("toOrderStatus")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             oMap.put("remark","修改运输订单状态为" + map.get("toOrderStatus") + ";原订单状态为" + map.get("orderStatus")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             backgroundProcessingMapper.modifyOrderStatus(oMap); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            return success(1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        return success(1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return failed("修改失败:存在空值!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @ApiOperation(value = "强制重置密码接口") 
			 |