From 0981233fe196fd95f0d81ca4d272648659e853c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 12 Mar 2021 15:07:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/ShopOrder.php     | 5 +++--
 vendor/composer/autoload_classmap.php | 2 ++
 vendor/composer/autoload_static.php   | 2 ++
 vendor/services.php                   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/data/controller/ShopOrder.php b/app/data/controller/ShopOrder.php
index e2c5ead22..0fb466998 100644
--- a/app/data/controller/ShopOrder.php
+++ b/app/data/controller/ShopOrder.php
@@ -180,16 +180,17 @@ class ShopOrder extends Controller
         ]);
         $order = $this->app->db->name($this->table)->where($map)->find();
         if (empty($order)) $this->error('订单查询异常');
-        if (!in_array($order['status'], [1, 2])) $this->error('订单不能取消！');
+        if (!in_array($order['status'], [1, 2, 3])) $this->error('订单不能取消！');
         try {
             $result = $this->app->db->name($this->table)->where($map)->update([
                 'status'          => 0,
                 'cancel_status'   => 1,
-                'cancel_remark'   => '后台未支付的取消',
+                'cancel_remark'   => '后台取消未支付的订单',
                 'cancel_datetime' => date('Y-m-d H:i:s'),
             ]);
             if ($result !== false) {
                 OrderService::instance()->syncStock($order['order_no']);
+                $this->app->event->trigger('ShopOrderCancel', $order['order_no']);
                 $this->success('取消未支付的订单成功！');
             } else {
                 $this->error('取消支付的订单失败！');
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 51e607ce7..c8aa0795a 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -248,6 +248,8 @@ return array(
     'app\\data\\service\\RebateYearService' => $baseDir . '/app/data/service/RebateYearService.php',
     'app\\data\\service\\TruckService' => $baseDir . '/app/data/service/TruckService.php',
     'app\\data\\service\\UserService' => $baseDir . '/app/data/service/UserService.php',
+    'app\\data\\service\\UserTokenService' => $baseDir . '/app/data/service/UserTokenService.php',
+    'app\\data\\service\\UserUpgradeService' => $baseDir . '/app/data/service/UserUpgradeService.php',
     'app\\data\\service\\payment\\AlipayPaymentService' => $baseDir . '/app/data/service/payment/AlipayPaymentService.php',
     'app\\data\\service\\payment\\BalancePyamentService' => $baseDir . '/app/data/service/payment/BalancePyamentService.php',
     'app\\data\\service\\payment\\EmptyPaymentService' => $baseDir . '/app/data/service/payment/EmptyPaymentService.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 515b31519..dab9addea 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -377,6 +377,8 @@ class ComposerStaticInit4f89fd0e0503ccf740f2fa5757825d7b
         'app\\data\\service\\RebateYearService' => __DIR__ . '/../..' . '/app/data/service/RebateYearService.php',
         'app\\data\\service\\TruckService' => __DIR__ . '/../..' . '/app/data/service/TruckService.php',
         'app\\data\\service\\UserService' => __DIR__ . '/../..' . '/app/data/service/UserService.php',
+        'app\\data\\service\\UserTokenService' => __DIR__ . '/../..' . '/app/data/service/UserTokenService.php',
+        'app\\data\\service\\UserUpgradeService' => __DIR__ . '/../..' . '/app/data/service/UserUpgradeService.php',
         'app\\data\\service\\payment\\AlipayPaymentService' => __DIR__ . '/../..' . '/app/data/service/payment/AlipayPaymentService.php',
         'app\\data\\service\\payment\\BalancePyamentService' => __DIR__ . '/../..' . '/app/data/service/payment/BalancePyamentService.php',
         'app\\data\\service\\payment\\EmptyPaymentService' => __DIR__ . '/../..' . '/app/data/service/payment/EmptyPaymentService.php',
diff --git a/vendor/services.php b/vendor/services.php
index 739847102..d64a75a5d 100644
--- a/vendor/services.php
+++ b/vendor/services.php
@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2021-03-11 16:26:29
+// This file is automatically generated at:2021-03-12 15:07:09
 declare (strict_types = 1);
 return array (
   0 => 'think\\admin\\Library',