From 0b8e5372c44771c3806f12c19efde7e70fb29702 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 19 Nov 2024 14:38:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(admin):=20=E4=BF=AE=E5=A4=8D=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=BB=B7=E6=A0=BC=E5=92=8C=E9=97=A8=E5=BA=97=20id=20?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 BeforehandOrderLogic 中添加 store_id 的保存逻辑
- 在 BeforehandOrderCartInfoLogic 中更新订单价格计算逻辑
---
 app/admin/logic/beforehand_order/BeforehandOrderLogic.php   | 6 ++----
 .../BeforehandOrderCartInfoLogic.php                        | 5 ++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
index bde344d9e..05cccca76 100644
--- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
+++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
@@ -313,13 +313,11 @@ class BeforehandOrderLogic extends BaseLogic
         Db::startTrans();
         try {
             $find = BeforehandOrder::where('id', $params['id'])->find();
-            $other_data = $find['other_data'];
-            if (!empty($params['other_data']['arrival_time'])) {
-                $other_data->arrival_time = $params['other_data']['arrival_time'];
-            }
+            $other_data = $params['other_data'];
             $find->save([
                 'other_data' => json_encode($other_data, true),
                 'file' => $params['file'],
+                'store_id' => $params['store_id'],
                 'mark' => $params['mark']
             ]);
             Db::commit();
diff --git a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
index 99c6c5f8a..1715a0fe3 100644
--- a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
+++ b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
@@ -235,7 +235,10 @@ class BeforehandOrderCartInfoLogic extends BaseLogic
         if($find['is_buyer']==1){
             PurchaseProductOffer::where('order_id',$find['bhoid'])->where('product_id',$find['product_id'])->update(['delete_time'=>time()]);
         }
-        return BeforehandOrderCartInfo::destroy($params['id']);
+        $res=BeforehandOrderCartInfo::destroy($params['id']);
+        $pay_price=BeforehandOrderCartInfo::where('bhoid', $params['id'])->sum('pay_price');
+        BeforehandOrder::where('id',$find['bhoid'])->update(['pay_price'=>$pay_price]);
+        return $res;
     }