Просмотр исходного кода

Merge branch 'master' into dev

shish 2 месяцев назад
Родитель
Сommit
1714852ce1
1 измененных файлов с 2 добавлено и 1 удалено
  1. 2 1
      biz-ghs/order/classes/CheckOrderClass.php

+ 2 - 1
biz-ghs/order/classes/CheckOrderClass.php

@@ -400,6 +400,7 @@ class CheckOrderClass extends BaseClass
                     if ($v['itemNum'] <= 0 && $productData->status == 1) {
                         $productData->status = 2;
                     }
+                    $oldStockVal = $productData->stock ?? 0;
                     $productData->stock = $v['itemNum'];
                     if ($adminId) {
                         $productData->adminId = $adminId;
@@ -416,7 +417,7 @@ class CheckOrderClass extends BaseClass
                     $record['itemId'] = $v['itemId'];
                     $record['productId'] = $productId;
                     $record['itemNum'] = abs($v['profitLossNum']);
-                    $record['oldStock'] = $productData->stock ?? 0;
+                    $record['oldStock'] = $oldStockVal;
                     $record['newStock'] = $v['itemNum'];
                     $record['targetId'] = $order->id ?? 0;
                     $record['remark'] = $remark;