From 15275b399c7e0f97fea281428ef53376b4003e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Wed, 17 Aug 2022 18:34:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20#100000=20=E9=A2=84=E7=95=99?=
 =?UTF-8?q?=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Goods/GoodsSkusController.php | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/Goods/GoodsSkusController.php b/app/Http/Controllers/Goods/GoodsSkusController.php
index cbe0b21..cb0fecb 100644
--- a/app/Http/Controllers/Goods/GoodsSkusController.php
+++ b/app/Http/Controllers/Goods/GoodsSkusController.php
@@ -319,23 +319,24 @@ class GoodsSkusController extends Controller
             $record->save();
             $this->setAfterUpdate($record->loss_num);
             $sku->stock -= $request->loss_num;
+            $sku->save();
         } else {
-            $sku->$updateField = $request->$updateField;
-        }
-        $this->setBeforeUpdate($sku->$updateField);
-        if ('reserve' === $updateField) {
-            $changeNum = $sku->reserve - $request->reserve;
-            if (0 > $changeNum + $sku->stock) {
-                $this->setValidatorFailResponse('预留量超过库存数量');
-                goto end;
+            $this->setBeforeUpdate($sku->$updateField);
+            if ('reserve' === $updateField) {
+                $changeNum = $sku->reserve - $request->reserve;
+                if (0 > $changeNum + $sku->stock) {
+                    $this->setValidatorFailResponse('预留量超过库存数量');
+                    goto end;
+                }
+                $sku->stock += $changeNum;
             }
-            $sku->stock += $changeNum;
+            $sku->$updateField = $request->$updateField;
+            $sku->save();
+            $this->setAfterUpdate($sku->$updateField);
         }
-        $sku->save();
         if (in_array($updateField, ['reserve', 'loss_num'])) {
             event(new StockUpdateEvent($sku));
         }
-        $this->setAfterUpdate($sku->$updateField);
         $this->addLog($id, $updateField);
         end:
 

From 9356d9b68dea254de53458831c27c6dd90494b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Wed, 17 Aug 2022 18:42:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20#10000=20=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/Log.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/Models/Log.php b/app/Models/Log.php
index be323d7..95c8360 100644
--- a/app/Models/Log.php
+++ b/app/Models/Log.php
@@ -90,6 +90,14 @@ class Log extends Model
             'cost' => '成本',
             'stock' => '库存',
             'inventory' => '库存盘点',
+            'reserve' => '预留量 ',
+            'timingInventory' => '7店盘点 ',
+            'pdd.ktt.goods.query.list' => '快团团下载绑定商品',
+            'arrived_today_num' => '今日到货',
+            'loss_num' => '损耗',
+            'pdd.pop.auth.token.create' => '快团团授权',
+            'reference_price' => '参考价格',
+            'update' => '更新',
         ];
 
         return $map[$value] ?? $value;