| 
					
				 | 
			
			
				@@ -605,18 +605,12 @@ class Import 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $data = Dever::db('agent/order')->select(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if ($data) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             foreach ($data as $k => $v) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 $role = Dever::db('setting/role')->find($v['role']); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                $price = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if ($role['type'] == 1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    $data['price'] = $role['price']; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                } elseif ($data['role']['type'] == 2) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    $data['area'] = $this->checkArea($data['area'], $data['role'], $member ? $member['id'] : false); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    $data['price'] = Dever::load('area/api')->getPrice($data['role']['area'], $data['area']); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    if ($data['price'] <= 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        Dever::alert('代理区域的代理价格为空,请联系客服'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    Dever::alert('代理类型不正确'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    $price = $role['price']; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } elseif ($role['type'] == 2) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    $price = Dever::load('area/api')->getPrice($role['area'], $v['area']); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 |