API-自动取消订单-完善自动取消订单功能异常处理

app/common/repositories/store/order/StoreGroupOrderRepository.php

@@ -178,20 +178,33 @@ class StoreGroupOrderRepository extends BaseRepository
         }
 
         // 3、逻辑处理
-        Db::startTrans();
         try {
-            // 软 删除订单组
-            $storeGroupOrderEntity->setIsDel(StoreGroupOrderEnum::IS_DEL['Yes']['code']);
-            $this->update($storeGroupOrderEntity->getGroupOrderId(), $storeGroupOrderEntity->toUnderlineArray());
-
-            // 循环关闭订单组内的数据
-            foreach ($storeOrderEntityList as $storeOrderEntity) {
-                $storeOrderRepository->closeStoreOrder($storeOrderEntity, $uid, $changeMessage, $remark);
-            }
+            Db::transaction(function () use (
+                $storeOrderRepository,
+                $storeGroupOrderEntity,
+                $storeOrderEntityList,
+                $uid,
+                $changeMessage,
+                $remark
+            ) {
+                // 软 删除订单组
+                $storeGroupOrderEntity->setIsDel(StoreGroupOrderEnum::IS_DEL['Yes']['code']);
+                $this->update($storeGroupOrderEntity->getGroupOrderId(), $storeGroupOrderEntity->toUnderlineArray());
 
-            Db::commit();
-        } catch (DbException $e) {
-            Db::rollback();
+                // 循环关闭订单组内的数据
+                foreach ($storeOrderEntityList as $storeOrderEntity) {
+                    $storeOrderRepository->closeStoreOrder($storeOrderEntity, $uid, $changeMessage, $remark);
+                }
+            });
+        } catch (\Throwable $e) {
+            throw new ValidateException('关闭订单失败:' . json_encode([
+                    'error_message' => $e->getMessage(),
+                    'error_file' => $e->getFile(),
+                    'error_line' => $e->getLine(),
+                    'error_code' => $e->getCode(),
+                    'exception_class' => get_class($e),
+                    'trace' => $e->getTraceAsString()
+                ], JSON_UNESCAPED_UNICODE));
         }
 
         // $groupOrder = $this->search(['paid' => 0, 'uid' => $uid ?: ''])->where('group_order_id', $id)->with(['orderList'])->find();

app/common/repositories/store/order/StoreOrderRepository.php

@@ -12313,8 +12313,15 @@ class StoreOrderRepository extends BaseRepository
 
             // 5、撤回订单扣除的数据项
             $this->cancellation($userEntity, $storeOrderEntity, $fzonePayTypeEntity);
-        } catch (DbException $e) {
-            throw new ValidateException('支付失败，支付方式错误！');
+        } catch (\Throwable $e) {
+            throw new ValidateException('关闭订单失败:' . json_encode([
+                    'error_message' => $e->getMessage(),
+                    'error_file' => $e->getFile(),
+                    'error_line' => $e->getLine(),
+                    'error_code' => $e->getCode(),
+                    'exception_class' => get_class($e),
+                    'trace' => $e->getTraceAsString()
+                ], JSON_UNESCAPED_UNICODE));
         }
     }
 

app/controller/merchant/store/order/Order.php

@@ -20,6 +20,7 @@ use think\App;
 use crmeb\basic\BaseController;
 use app\common\repositories\store\order\StoreOrderRepository as repository;
 use think\facade\Db;
+use think\facade\Log;
 
 class Order extends BaseController
 {
@@ -439,18 +440,34 @@ class Order extends BaseController
     /**
      * @param $id
      * @param StoreGroupOrderRepository $groupOrderRepository
+     * @param repository $orderRepository
      * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
      * @author xaboy
      * @day 2020/6/10
      */
     public function cancelGroupOrder($id, StoreGroupOrderRepository $groupOrderRepository, StoreOrderRepository $orderRepository)
     {
-        $data = $this->request->params(['change_message','remark']);
+        $data = $this->request->params(['change_message', 'remark']);
         $merId = $this->request->merId();
         $order = $orderRepository->getWhere(['group_order_id' => $id]);
         if ($order['mer_id'] != $merId)
             return app('json')->fail('数据不存在');
-        $groupOrderRepository->cancel((int)$id, 0, $data['change_message'], $data['remark']);
+        try {
+            $groupOrderRepository->cancel((int)$id, 0, $data['change_message'], $data['remark']);
+        } catch (\Throwable $e) {
+            Log::error('关闭订单失败:' . json_encode([
+                    'error_message' => $e->getMessage(),
+                    'error_file' => $e->getFile(),
+                    'error_line' => $e->getLine(),
+                    'error_code' => $e->getCode(),
+                    'exception_class' => get_class($e),
+                    'trace' => $e->getTraceAsString()
+                ], JSON_UNESCAPED_UNICODE));
+            return app('json')->fail('关闭订单失败');
+        }
         return app('json')->success('取消成功');
     }
 

crmeb/listens/AutoCancelGroupOrderListen.php

@@ -22,6 +22,7 @@ class AutoCancelGroupOrderListen implements ListenerInterface
 
     public function handle($event): void
     {
+        /** @var StoreGroupOrderRepository $storeGroupOrderRepository */
         $storeGroupOrderRepository = app()->make(StoreGroupOrderRepository::class);
         Timer::tick(60000, function () use ($storeGroupOrderRepository) {
             $timer = ((int)systemConfig('auto_close_order_timer')) ?: 15;