| 
					
				 | 
			
			
				@@ -22,7 +22,6 @@ class Card 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	public function total() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		$total = Dever::db('youzan/card_list')->total(array('option_state' => 1, 'option_status' => 1)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		print_r($total);die; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		return Dever::lock($this->lock, $total); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -80,7 +79,7 @@ class Card 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		$id = Dever::input('id'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		$info = Dever::db('youzan/card')->one($id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		if ($info) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			Core::run($info['project_id'], 'card_create', 'card.createStart', 'card.createEnd', 'youzan', $id, true); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			Core::run($info['project_id'], 'card_create', 'card.createStart', 'card.createEnd', 'youzan', $id, false); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		Dever::alert('提交成功,请到优惠券列表中查看'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		return; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -147,7 +146,6 @@ class Card 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	public function createEnd($project_id, $data, $id = false, $end = false) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		if ($end) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			echo $end;die; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			# 如果执行结束,则加到库存里 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			$this->total(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} else { 
			 |