From 760c0faca698c170a28ecba60943f2dd931ac212 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 21 Aug 2024 20:15:29 +0800
Subject: [PATCH] =?UTF-8?q?feat(WarehouseOrderLogic):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E9=80=BB=E8=BE=91=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=93=E5=AD=98=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=96=B9=E5=BC=8F=EF=BC=8C=E6=8F=90=E9=AB=98=E4=BA=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=9A=84=E5=8F=AF=E8=AF=BB=E6=80=A7=E5=92=8C?=
 =?UTF-8?q?=E7=A8=B3=E5=AE=9A=E6=80=A7=EF=BC=8C=E5=B9=B6=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=BA=86=E7=9B=B8=E5=85=B3API=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/warehouse_order/WarehouseOrderLogic.php  | 2 +-
 .../logic/warehouse_product/WarehouseProductLogic.php    | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/admin/logic/warehouse_order/WarehouseOrderLogic.php b/app/admin/logic/warehouse_order/WarehouseOrderLogic.php
index 6e4b075ab..8a31a5a44 100644
--- a/app/admin/logic/warehouse_order/WarehouseOrderLogic.php
+++ b/app/admin/logic/warehouse_order/WarehouseOrderLogic.php
@@ -148,6 +148,7 @@ class WarehouseOrderLogic extends BaseLogic
             self::setError('该订单下还有商品没有删除，请先删除商品');
             return false;
         }
+        WarehouseOrder::destroy($params['id']);
         $find = WarehouseProduct::where('oid', $params['id'])->field('sum(nums) as nums,sum(total_price) as total_price')->find();
         if ($find) {
             WarehouseOrder::where('id', $params['id'])->update([
@@ -155,7 +156,6 @@ class WarehouseOrderLogic extends BaseLogic
                 'total_price' => $find['total_price']
             ]);
         }
-        WarehouseOrder::destroy($params['id']);
         return true;
     }
 
diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php
index a6b47dd68..6d0c094f2 100644
--- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php
+++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php
@@ -9,6 +9,7 @@ use app\common\model\purchase_product_offer\PurchaseProductOffer;
 use app\common\model\store_branch_product\StoreBranchProduct;
 use app\common\model\store_product\StoreProduct;
 use app\common\model\system_store_storage\SystemStoreStorage;
+use app\common\model\warehouse_order\WarehouseOrder;
 use app\common\model\warehouse_product_storege\WarehouseProductStorege;
 use support\Log;
 use think\facade\Db;
@@ -167,7 +168,13 @@ class WarehouseProductLogic extends BaseLogic
                 StoreBranchProduct::where(['store_id' => $res['store_id'], 'product_id' => $res['product_id']])->dec('stock', $res['nums'])->update();
                 WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->where('product_id', $res['product_id'])->inc('nums', $res['nums'])->update();
             }
-
+            $find = WarehouseProduct::where('oid', $res['oid'])->field('sum(nums) as nums,sum(total_price) as total_price')->find();
+            if ($find) {
+                WarehouseOrder::where('id', $res['oid'])->update([
+                    'nums' => $find['nums'],
+                    'total_price' => $find['total_price']
+                ]);
+            }
             return true;
         }
         return false;