| 
					
				 | 
			
			
				@@ -541,7 +541,7 @@ class Buy 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $type = Dever::input('type', 1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        $cash_type = Dever::input('cash_type', 1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $cash_type = Dever::input('cash', 1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $config = Dever::db('shop/buy_order')->config; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1083,10 +1083,12 @@ class Buy 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if ($this->order_num > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if ($this->order_num == 1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                Dever::db('shop/buy_order')->delete($find[2][0]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                $goods = Dever::db('shop/buy_order_goods')->select(array('order_id' => $find[2][0])); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $num = count($this->order_id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if ($num > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if ($num == 1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                $key = array_keys($this->order_id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                Dever::db('shop/buy_order')->delete($key[0]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                $goods = Dever::db('shop/buy_order_goods')->select(array('order_id' => $key[0])); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 $p_price = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 foreach ($goods as $k => $v) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1099,12 +1101,12 @@ class Buy 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                Dever::db('shop/buy_order')->update(array('where_id' => $order['id'], 'status' => 3, 'source_type' => $find[0], 'source_id' =>  $find[1][0], 'p_price' => $p_price, 'operdate' => time())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                Dever::db('shop/buy_order')->update(array('where_id' => $order['id'], 'status' => 3, 'source_type' => $this->order_id[$key][0], 'source_id' =>  $this->order_id[$key][1], 'p_price' => $p_price, 'operdate' => time())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                Dever::db('shop/buy_order_goods')->delete(array('order_id' => $find[2][0])); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                Dever::db('shop/buy_order_goods')->delete(array('order_id' => $key[0])); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                unset($this->order_id[$find[2][0]]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                $this->order_id[$order['id']] = array($find[0], $find[1][0]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                unset($this->order_id[$key[0]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                $this->order_id[$order['id']] = array($this->order_id[$key][0], $this->order_id[$key][1]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (!$yes) { 
			 |