| 
					
				 | 
			
			
				@@ -68,8 +68,7 @@ class Ship 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		foreach ($order_delivery as $k => $v) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			$express = Dever::db('goods/express')->find($v['base']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			$info = explode(',', $v['info']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			if ($v['order_goods_id']) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				print_r($v);die;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			if ($v['order_goods_id'] && $v['order_goods_id'] > 0) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				$order_goods = Dever::db('order/sell_goods')->find($v['order_goods_id']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				$goods = Dever::load('goods/lib/info.getBaseInfo', $order_goods['goods_id'], $order_goods['sku_id']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				$goods_name = $goods['aname'];
 
			 |