From 6cb0bb359a5aa9420687bc73535c235536ac708b Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 27 Jun 2024 17:28:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=92=8C=E9=97=A8=E5=BA=97=E8=B4=A2=E5=8A=A1?=
 =?UTF-8?q?=E6=B5=81=E6=B0=B4=E9=80=BB=E8=BE=91=E4=BB=A5=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=A0=B8=E9=94=80=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/order/OrderLogic.php         | 8 ++++----
 app/common/logic/StoreFinanceFlowLogic.php | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index 50ebcfd5e..f1d156db3 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -449,14 +449,14 @@ class OrderLogic extends BaseLogic
                 UserSign::where(['uid' => $order['uid'],'order_id' => $order['order_id']])->update(['status'=>1]);
             }
             if ($order['spread_uid'] > 0) {
-                $spread_number=$financeFlow->where(['order_id'=>$order['id'],'financial_pm'=>1,'financial_type'=>12,'other_uid'=>$order['spread_uid']])->value('number');
-                if($spread_number){
-                    $financeFlowLogic->updateStatusUser($v['id'],$order['spread_uid'],$spread_number,$v['order_id']);
+                $spread_find=$financeFlow->where(['order_id'=>$order['id'],'financial_pm'=>1,'financial_type'=>12,'other_uid'=>$order['spread_uid']])->find();
+                if($spread_find){
+                    $financeFlowLogic->updateStatusUser($spread_find['id'],$order['spread_uid'],$spread_find['number'],$order['order_id']);
                 }
             }
             $deposit=$financeFlow->where(['order_id'=>$order['id'],'financial_pm'=>1,'financial_type'=>11])->value('number');
             $money=$financeFlow->where(['order_id'=>$order['id'],'financial_pm'=>1,'financial_type'=>2])->value('number');
-            $financeFlowLogic->updateStatusStore($v['id'],$order['store_id'],$money,$deposit);
+            $financeFlowLogic->updateStatusStore($order['id'],$order['store_id'],$money,$deposit);
 
             Db::commit();
             return true;
diff --git a/app/common/logic/StoreFinanceFlowLogic.php b/app/common/logic/StoreFinanceFlowLogic.php
index 299b9e05d..f5bb794f9 100644
--- a/app/common/logic/StoreFinanceFlowLogic.php
+++ b/app/common/logic/StoreFinanceFlowLogic.php
@@ -141,8 +141,9 @@ class StoreFinanceFlowLogic extends BaseLogic
     /**
      * 核销后更新门店余额
      */
-    public function updateStatusStore($id,$store_id,$money,$deposit){
-        StoreFinanceFlow::where('id', $id)->update(['status' => 1]);
+    public function updateStatusStore($order_id,$store_id,$money,$deposit){
+        StoreFinanceFlow::where(['order_id'=>$order_id,'financial_pm'=>1,'financial_type'=>11])->update(['status' => 1]);
+        StoreFinanceFlow::where(['order_id'=>$order_id,'financial_pm'=>1,'financial_type'=>2])->update(['status' => 1]);
         if($money){
             SystemStore::where('id', $store_id)->inc('store_money', $money)->update();
         }