Merge branch 'master' into dev

biz-ghs/order/classes/CheckOrderClass.php

@@ -428,6 +428,12 @@ class CheckOrderClass extends BaseClass
                     } else {
                         $subAmount = bcadd($subAmount, $amount, 2);
                     }
+
+                    //如果花材是自动补充库存类型的花材，则库存低于900时，自动补充到6850,多处要同步修改，关键词 auto_add_stock
+                    if ($productData->virtualStock == 1 && $v['itemNum'] < 900) {
+                        ProductClass::updateStockById($productId, 6850, $adminId);
+                    }
+
                 }
 
                 $shop = ShopClass::getById($shopId, true);

biz-ghs/product/classes/ProductClass.php

@@ -1028,9 +1028,9 @@ class ProductClass extends BaseClass
             self::updateActualSoldById($productId, $newActualSold);
         }
 
-        //如果花材是自动补充库存类型的花材，则库存低于1000时，自动补充到5999
-        if ($productData->virtualStock == 1 && $newStock < 1000) {
-            self::updateStockById($productId, 5999);
+        //如果花材是自动补充库存类型的花材，则库存低于900时，自动补充到6850,多处要同步修改，关键词 auto_add_stock
+        if ($productData->virtualStock == 1 && $newStock < 900) {
+            self::updateStockById($productId, 6850);
         }
 
         //库存=0 下架商品，特价去掉，限购去掉 lqh 2021.7.9 ssh 20251106