From d010c08931b02184a615cb0ebf8cd00d7837c188 Mon Sep 17 00:00:00 2001 From: liapples Date: Tue, 31 Aug 2021 14:25:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81path?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/VerificationController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/VerificationController.php b/app/Http/Controllers/Api/VerificationController.php index f90ad8e..6191dfb 100644 --- a/app/Http/Controllers/Api/VerificationController.php +++ b/app/Http/Controllers/Api/VerificationController.php @@ -41,6 +41,7 @@ class VerificationController extends Controller return $this->success(); } + //生成核销二维码 public function qrcode() { $id = request()->input('id'); //订单ID @@ -64,7 +65,7 @@ class VerificationController extends Controller ]; $app = Factory::miniProgram($config); - $response = $app->app_code->getUnlimit($verify_code, ['path' => 'pages/index/index']); + $response = $app->app_code->getUnlimit($verify_code, ['path' => 'pages/verification/index']); if ($response instanceof \EasyWeChat\Kernel\Http\StreamResponse) { $filename = $response->saveAs(storage_path('app/public/verify_code'), $verify_code); From f9c6d8a4e1fe9bc96240b1820feec547c0817900 Mon Sep 17 00:00:00 2001 From: liapples Date: Tue, 31 Aug 2021 14:31:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0OFFLINE=5FPAID=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/VerificationController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/VerificationController.php b/app/Http/Controllers/Api/VerificationController.php index 6191dfb..2db89ef 100644 --- a/app/Http/Controllers/Api/VerificationController.php +++ b/app/Http/Controllers/Api/VerificationController.php @@ -49,7 +49,7 @@ class VerificationController extends Controller $order = Order::where(['agent_id' => $this->agent_id, 'user_id' => $this->user_id])->find($id); if (!$order) { return $this->error('订单不存在!'); - } else if (!in_array($order->status, [OrderStatus::PAID, OrderStatus::PAID_RETAINAGE, OrderStatus::REFUSED_REFUND])) { + } else if (!in_array($order->status, [OrderStatus::PAID, OrderStatus::PAID_RETAINAGE, OrderStatus::OFFLINE_PAID, OrderStatus::REFUSED_REFUND])) { return $this->error('当前订单状态不允许核销!'); } else if (!$order->verify_code) { $order->verify_code = uniqid();