From 69af7a7fbc920a1508ed63852f192db6988b224e Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 23 Sep 2023 14:36:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=9D=E8=AF=81=E9=87=91?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/Auth.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index ad92412a..e6cecfa7 100644 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -68,15 +68,13 @@ class Auth extends BaseController $param = [ "status" => 0, "is_del" => 0, - "mer_id" => 5, - "type" => 10, - "meal_id" => 10, + "mer_id" => 1, "pay_type" => 1, - "attach" => "meal", - "order_info" => '{"type_id":10,"is_margin":1,"margin":"0.01"}', - "pay_price" => "0.01", + "attach" => "margin", + "order_info" => '{"is_margin":1,"margin":"0.01"}', + "pay_price" => 0.01, "order_sn" => "bzj" . date('YmdHis') . uniqid(), - "body" => uniqid(), + "body" =>'哈哈哈', ]; $payType = 'weixinApp'; $service = new PayService($payType, $param); @@ -278,7 +276,7 @@ class Auth extends BaseController public function doMargin() { $user = $this->request->userInfo(); - $merchant = Db::name('merchant')->where('uid', $user['uid'])->where('status', 1)->find(); + $merchant = Db::name('merchant')->where('uid', $user['uid'])->where('status', 1)->where('is_margin', 1)->find(); if (!$merchant) { return app('json')->fail('用户店铺异常'); } @@ -288,7 +286,7 @@ class Auth extends BaseController "is_del" => 0, "mer_id" => $merchant['mer_id'], "pay_type" => 1, - "attach" => "meal", + "attach" => "margin", "order_info" => '{"is_margin":1,"margin":"' . $merchant['margin'] . '"}', "pay_price" => $merchant['margin'], "order_sn" => "bzj" . date('YmdHis') . uniqid(),