Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop

app/Http/Controllers/Api/OrderController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api;
 use App\Common\PayType;
 use App\Common\ProductStatus;
 use App\Http\Controllers\Controller;
+use App\Models\AdminSetting;
 use App\Models\Agent;
 use App\Models\AgentProduct;
 use App\Models\AgentSetting;
@@ -227,7 +228,7 @@ class OrderController extends Controller
 				return $this->error($config['err_code_des'] ?? join(',', $config));
 			}*/
 			// TODO 跳转支付专用
-			return $this->success(['id' => $order->id, 'jump' => true, 'jump_appid' => 'wxb35ef055a4dd8ad4']);
+			return $this->success(['id' => $order->id, 'jump' => true, 'jump_appid' => AdminSetting::val('payee_appid')]);
 		}
 	}
 
@@ -328,7 +329,10 @@ class OrderController extends Controller
 			return $this->error('订单已支付或已超时');
 		}
 
-		$ap = AgentProduct::with('coupon')->find($order->agent_product_id);
+		// TODO 跳转支付专用
+		return $this->success(['id' => $id, 'jump' => true, 'jump_appid' => AdminSetting::val('payee_appid')]);
+
+		/*$ap = AgentProduct::with('coupon')->find($order->agent_product_id);
 
 		//如果已经付定金或首付款，则仅支付尾款
 		if ($order->status == Status::PAY_EARNEST) {
@@ -342,7 +346,7 @@ class OrderController extends Controller
 			return $this->success($config);
 		} else {
 			return $this->error($config['err_code_des'] ?? join(',', $config));
-		}
+		}*/
 	}
 
 	//获取支付配置信息

app/Http/Controllers/Api/SharePayController.php

@@ -53,7 +53,7 @@ class SharePayController extends Controller
 		if ($order->status == Status::PAY_EARNEST) {
 			$price = $order->price - $order->paid_money;
 		} else {
-			$price = $this->calc($order->price, $order->num, $order->pay_type, $order->agent_product);
+			$price = $this->calc($order->price, $order->num, $order->pay_type, $order->agentProduct);
 		}
 
 		$config = config('wechat.payment.default');