|  | @@ -45,7 +45,6 @@ class Card
 | 
	
		
			
				|  |  |  	# 分配优惠券,此处需要做高并发处理
 | 
	
		
			
				|  |  |  	public function get()
 | 
	
		
			
				|  |  |  	{
 | 
	
		
			
				|  |  | -		Dever::alert('error');
 | 
	
		
			
				|  |  |  		$key = Dever::input('key');
 | 
	
		
			
				|  |  |  		$user = Dever::input('user');
 | 
	
		
			
				|  |  |  		$msg_page = Dever::input('msg_page');
 | 
	
	
		
			
				|  | @@ -60,6 +59,13 @@ class Card
 | 
	
		
			
				|  |  |  				$state = Dever::lock($this->lock . '_' . $info['id']);
 | 
	
		
			
				|  |  |  				//$state = true;
 | 
	
		
			
				|  |  |  				if (!$state) {
 | 
	
		
			
				|  |  | +					if ($msg_project_id && $info['msg_key'] && $info['msg_page'] && $info['msg_content']) {
 | 
	
		
			
				|  |  | +						if ($msg_page) {
 | 
	
		
			
				|  |  | +							$info['msg_page'] = $msg_page;
 | 
	
		
			
				|  |  | +						}
 | 
	
		
			
				|  |  | +						$send = Dever::load('applet/msg')->getData($info['msg_content']);
 | 
	
		
			
				|  |  | +						Dever::load('applet/msg')->sendOne($info['msg_key'], $msg_project_id, $user, $info['msg_page'], $send);
 | 
	
		
			
				|  |  | +					}
 | 
	
		
			
				|  |  |  					Dever::alert('error');
 | 
	
		
			
				|  |  |  				} else {
 | 
	
		
			
				|  |  |  					$list = Dever::db('youzan/card_list')->getAll(array('option_card_id' => $info['id'], 'option_status' => 1));
 |