From 00a72c0b71db9b46630c27e740ac490306898f86 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 17 Jun 2024 10:22:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=A0=B8=E9=94=80=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/order/OrderLogic.php                    |  4 ++++
 .../controller/store_order/StoreOrderController.php   | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index 3d5189acd..7f50e6ea2 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -388,11 +388,15 @@ class OrderLogic extends BaseLogic
                 'status' => OrderEnum::RECEIVED_GOODS,
                 'is_writeoff' => OrderEnum::IS_OK,
                 'update_time' => time(),
+                'store_id' => $params['store_id'],
+                'staff_id' => $params['staff_id']??0,
             ], ['id' => $data['id']]);
             (new StoreOrderCartInfo())->update([
                 'verify_code'=>$params['verify_code'].'-1',
                 'writeoff_time' => time(),
                 'is_writeoff' => YesNoEnum::YES,
+                'store_id' => $params['store_id'],
+                'staff_id' => $params['staff_id']??0,
                 'update_time' => time(),
             ], ['oid' => $data['id']]);
             $financeFlow = (new StoreFinanceFlowLogic)->getStoreOrder($data['id'], $data['store_id']);
diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php
index 765fb4a2b..70eba2f91 100644
--- a/app/store/controller/store_order/StoreOrderController.php
+++ b/app/store/controller/store_order/StoreOrderController.php
@@ -151,6 +151,9 @@ class StoreOrderController extends BaseAdminController
     }
 
 
+    /**
+     * 创建订单
+     */
     public function createOrder()
     {
         $cartId = (array)$this->request->post('cart_id', []);
@@ -216,6 +219,9 @@ class StoreOrderController extends BaseAdminController
         }
     }
 
+    /**
+     * 重新支付
+     */
     public function pay()
     {
         $order_id = $this->request->post('order_id');
@@ -273,6 +279,9 @@ class StoreOrderController extends BaseAdminController
         return $this->fail('支付失败');
     }
 
+    /**
+     * 订单核销
+     */
     public function writeoff_order()
     {
         $params = (new OrderValidate())->post()->goCheck('check');
@@ -280,6 +289,8 @@ class StoreOrderController extends BaseAdminController
         if (empty($count)) {
             return  $this->fail('无该核销码请检查');
         }
+        $params['store_id']=$this->adminInfo['store_id'];
+        $params['staff_id']=$this->adminId;
         $res = OrderLogic::writeOff($params);
         if ($res) {
             return $this->success('核销成功');