shish 11 сар өмнө
parent
commit
555132e488

+ 26 - 2
biz-hd/order/classes/OrderGoodsClass.php

@@ -207,7 +207,7 @@ class OrderGoodsClass extends BaseClass
     }
 
     //花店商家自主开单,库存不足则不能开单
-    public static function addData($data, $custom = null)
+    public static function addData($data, $custom = null, $goodsInfo = [])
     {
         $goodsId = $data['goodsId'] ?? 0;
         $num = $data['num'] ?? 0;
@@ -231,9 +231,33 @@ class OrderGoodsClass extends BaseClass
         $recordData['oldStock'] = $oldStock;
         $recordData['newStock'] = $newStock;
         $recordData['relateName'] = $customName;
-        //搜索关键词GoodsStockRecordClass::sellGoods,可以找到相同的方法,暂时没有写在一起
         GoodsStockRecordClass::sellGoods($recordData);
 
+        $currentGoods = $goodsInfo[$goodsId] ?? [];
+        if (!empty($currentGoods)) {
+            //如果定义库存充值的商品,并且库存低于999时,自动增加库存到6699
+            if (isset($currentGoods['stockSet']) && $currentGoods['stockSet'] == 0) {
+                if ($newStock < 999) {
+                    $addNum = bcsub(6999, $newStock);
+                    $ret = GoodsClass::addStock($goodsId, $mainId, $addNum);
+                    $oldStock = $ret['oldStock'] ?? 0;
+                    $newStock = $ret['newStock'] ?? 0;
+                    $recordData = [];
+                    $recordData['sjId'] = $sjId;
+                    $recordData['shopId'] = $shopId;
+                    $recordData['mainId'] = $mainId;
+                    $recordData['orderSn'] = '';
+                    $recordData['goodsId'] = $goodsId;
+                    $recordData['goodsNum'] = $addNum;
+                    $recordData['oldStock'] = $oldStock;
+                    $recordData['newStock'] = $newStock;
+                    $recordData['relateName'] = '系统';
+                    $recordData['remark'] = '自动补充库存';
+                    GoodsStockRecordClass::pdGoods($recordData);
+                }
+            }
+        }
+
         return self::add($data, true);
     }
 

+ 3 - 2
biz-hd/order/services/OrderService.php

@@ -2,6 +2,7 @@
 
 namespace bizHd\order\services;
 
+use bizGhs\item\classes\ItemClass;
 use bizHd\base\services\BaseService;
 use biz\sj\services\SjCapitalService;
 use biz\sj\services\MerchantService;
@@ -74,7 +75,7 @@ class OrderService extends BaseService
         $itemInfo = [];
         $currentItemIds = array_unique(array_filter($currentItemIds));
         if (!empty($currentItemIds)) {
-            $itemInfo = \bizGhs\item\classes\ItemClass::getByIds($currentItemIds, null, 'id');
+            $itemInfo = ItemClass::getByIds($currentItemIds, null, 'id');
         }
 
         $goodsPrice = 0;
@@ -134,7 +135,7 @@ class OrderService extends BaseService
                     'forwardStock' => $forwardStock,
                 ];
                 //占用库存在这里
-                OrderGoodsClass::addData($currentGoodsData, $custom);
+                OrderGoodsClass::addData($currentGoodsData, $custom, $goodsInfo);
             }
             if ($property == dict::getDict('property', 'item')) {
                 $currentInfo = $itemInfo[$currentId] ?? [];