From c9600128926c3207f3c1ed394ee4761debfe9e7d Mon Sep 17 00:00:00 2001 From: liapples Date: Fri, 10 Sep 2021 10:43:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E6=94=B9=E4=B8=BA=E8=B7=B3=E8=BD=AC=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/OrderController.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Api/OrderController.php b/app/Http/Controllers/Api/OrderController.php index 1f13f90..88b46b1 100644 --- a/app/Http/Controllers/Api/OrderController.php +++ b/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)); - } + }*/ } //获取支付配置信息