From 9bc69d71fee3bdc472c661b53950a5f87f17d408 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 26 Jul 2024 16:39:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BA=86=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=B4=A2=E5=8A=A1=E6=B5=81=E4=BA=A7=E5=93=81=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/order/OrderLogic.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index 1133af67a..c9eff7940 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -18,6 +18,7 @@ use app\common\model\order\Cart;
 use app\common\model\store_branch_product\StoreBranchProduct;
 use app\common\model\store_category\StoreCategory;
 use app\common\model\store_finance_flow\StoreFinanceFlow;
+use app\common\model\store_finance_flow_product\StoreFinanceFlowProduct;
 use app\common\model\store_order\StoreOrder;
 use app\common\model\store_order_cart_info\StoreOrderCartInfo;
 use app\common\model\store_product\StoreProduct;
@@ -576,11 +577,7 @@ class OrderLogic extends BaseLogic
                 'staff_id' => $params['staff_id'] ?? 0,
             ], ['id' => $order['id']]);
             //修改商品统计记录标识
-            (new StoreProductLog())->update(
-                [
-                    'store_id' => $params['store_id']
-                ],
-                ['oid' => $order['id']]
+            (new StoreProductLog())->update(['store_id' => $params['store_id'],'oid' => $order['id']]
             );
             (new StoreOrderCartInfo())->update([
                 'verify_code' => $params['verify_code'] . '-1',
@@ -591,6 +588,9 @@ class OrderLogic extends BaseLogic
                 'update_time' => time(),
             ], ['oid' => $order['id']]);
             $financeFlow = new StoreFinanceFlow();
+            $financeFlowProduct = new StoreFinanceFlowProduct();
+            $financeFlow->where('order_id',$order['id'])->update(['store_id'=>$params['store_id'],'staff_id'=>$params['staff_id'] ?? 0]);
+            $financeFlowProduct->where('oid',$order['id'])->update(['store_id'=>$params['store_id']]);
             $financeFlowLogic = new StoreFinanceFlowLogic();
             $select_1 = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 1, 'financial_type' => ['in' => 14, 15, 16]])->select();
             foreach ($select_1 as $k => $v) {