| 
					
				 | 
			
			
				@@ -4,6 +4,7 @@ namespace app\api\controller\pay; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 use app\api\controller\Log; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 use app\model\Order; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+use app\model\PayDetail; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 use support\Request; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 use Yansongda\Pay\Exceptions\BusinessException; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 use Yansongda\Pay\Pay; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -17,15 +18,15 @@ class AlipayController 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return json_fail('参数异常'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $orderId = $params['order_id']; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        $order = Order::where('order_id',$orderId)->where('order_status_payment','PENDING')->first(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (!$order){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $payDetail = PayDetail::where('join_pay_order_id',$orderId)->where('pay_status','PENDING')->first(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (!$payDetail){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return json_fail('订单异常'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $payData = [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             'out_trade_no' => $orderId, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             'subject' => '万悦康养订单', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            'total_amount' => $order->order_amount_pay, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            'total_amount' => $payDetail->pay_amount, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |