From f966f07843cf0f3504e1093c37e9dc3847983726 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Sat, 8 Jun 2024 17:21:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/order/OrderController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php
index 66e1f40d..ab338a72 100644
--- a/app/api/controller/order/OrderController.php
+++ b/app/api/controller/order/OrderController.php
@@ -316,7 +316,7 @@ class OrderController extends BaseApiController
                         StoreOrder::where(['id' => $order_id, 'uid' => Request()->userId])->update($_order);
                     }
                 }
-                $result = PaymentLogic::pay($pay_type, 'wechat_common', $order, $this->userInfo['terminal'], $redirectUrl);
+                $result = PaymentLogic::pay($pay_type, 'wechat_common', $order, $this->userInfo['terminal']??1, $redirectUrl);
                 if (PaymentLogic::hasError()) {
                     return $this->fail(PaymentLogic::getError());
                 }
@@ -405,7 +405,7 @@ class OrderController extends BaseApiController
         ];
         $order = StoreOrder::where($where)->find();
         if ($order) {
-            $data = ['data' => $value, 'delete_time' => time()];
+            $data = ['cancle_reason' => $value, 'delete_time' => time()];
             StoreOrder::where($where)->update($data);
             return $this->success('取消成功');
         }