wesmiler

app/Services/Common/OrderService.php

@@ -14,6 +14,8 @@ namespace App\Services\Common;
 use App\Models\AccountLogModel;
 use App\Models\ActionLogModel;
 use App\Models\MemberModel;
+use App\Models\OrderCommissionModel;
+use App\Models\OrderGoodsModel;
 use App\Models\OrderModel;
 use App\Services\Api\SettleService;
 use App\Services\BaseService;
@@ -294,11 +296,28 @@ class OrderService extends BaseService
             return ['code' => 1, 'msg' => '参数错误'];
         }
 
+        $this->model->where('mark',0)->where('create_time','<=', 600)->delete();
+        OrderGoodsModel::where('mark',0)->where('create_time','<=', 600)->delete();
+        OrderCommissionModel::where('mark',0)->where('create_time','<=', 600)->delete();
+
+        DB::beginTransaction();
         if (is_array($id)) {
+            $orders = $this->model->whereIn('id', $id)->pluck('order_no');
             $result = $this->model->whereIn('id', $id)->update(['mark' => 0]);
+            if($orders){
+                OrderGoodsModel::whereIn('order_no', $orders)->update(['mark' => 0]);
+                OrderCommissionModel::whereIn('order_no', $orders)->update(['mark' => 0]);
+            }
+
         } else {
+            $orderNo = $this->model->where('id', $id)->value('order_no');
             $result = $this->model->where('id', $id)->update(['mark' => 0]);
+            if($orderNo){
+                OrderGoodsModel::where('order_no', $orderNo)->update(['mark' => 0]);
+                OrderCommissionModel::where('order_no', $orderNo)->update(['mark' => 0]);
+            }
         }
+        DB::commit();
 
         if ($result) {
             ActionLogModel::setTitle("删除订单");