| 
					
				 | 
			
			
				@@ -61,7 +61,7 @@ class Data extends Core 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $order_id = Dever::input('order_id');
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        $info = Dever::db('shop/sell_order')->find('id' => $order_id));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $info = Dever::db('shop/sell_order')->find(array('id' => $order_id));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if ($info && $info['shop_id'] == $this->shop_id && $info['status'] < 3) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -80,13 +80,14 @@ class Data extends Core 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     $msg = '您有一件外送商品已开始配送,收货时请将取件码提供给配送员核实货品信息,取件码::' . $info['code'];
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     $name = '配送通知';
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    # 分配配送商家
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    Dever::load('shop/lib/sell')->updatePs($info, 2);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 Dever::load('message/lib/data')->push(-1, $info['uid'], $name, $msg, 1, 1, false, $msg_param);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if ($info['method'] == 2) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                Dever::load('shop/lib/sell')->updatePs($info, 2);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return 'ok';
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } else {
 
			 |