Merge branch 'inventory' into test

application/exception/custom/GoodsException.php

@@ -65,5 +65,6 @@ class GoodsException extends BaseException
         46 => '已经执行过cancel',
         47 => 'sku rollback error',
         48 => '请满足以下条件后提交，售价-分销总金额-手续费>=结算价',
+        49 => '库存不得小于已售库存',
     ];
 }
\ No newline at end of file

application/services/goods/MarketingPindanGoodsService.php

@@ -282,7 +282,12 @@ class MarketingPindanGoodsService
     private static function editGoodsSku($goodsSkuId, $skuData, $params = [])
     {
         $inventoryCount = $skuData["inventory_rest"] + $params["inventory_add"];
-        //$inventoryCount = $params["inventory"];
+        $inventoryTotal = $skuData["inventory_total"] + $params["inventory_add"];
+
+        if ($inventoryTotal < $skuData["inventory_lock"] + $skuData["total_amount_order"]) {
+            throw new GoodsException(['cus' => 49]);
+        }
+
         if ($inventoryCount < 0) {
             throw new GoodsException(['cus' => 18]);
         }
@@ -308,7 +313,7 @@ class MarketingPindanGoodsService
             "goods_name" => $params["goods_name"],
             "desc_pic_url" => $params["desc_pic_url"],
             "desc" => $params["desc"],
-            "inventory_total" => $skuData["inventory_total"] + $params["inventory_add"],
+            "inventory_total" => $inventoryTotal,
             "ota_id" => empty($params["ota_id"]) ? 0 : $params["ota_id"],
             "inventory_rest" => $inventoryCount,
             "original_price" => empty($params["original_price"]) ? "" : $params["original_price"] * 100,