Merge branch 'tuangou_1' of https://gitlab.yidian-inc.com/bp/goods into tuangou_1

application/exception/custom/GoodsException.php

@@ -46,5 +46,7 @@ class GoodsException extends BaseException
         32 => '当前商品已下单数量不足',
         33 => '售价不能为0',
         34 => '售价不能大于5万元',
+        35 => '结算价不能大于售价',
+        36 => '结算价不符合标准',
     ];
 }
\ No newline at end of file

application/models/marketing/mysql/Marketing.php

@@ -14,6 +14,13 @@ class Marketing extends MysqlBase
     const MARKETING_TYPE_TUANGOU = 2;
     const MARKETING_TYPE_MIAOSHA = 3;
 
+    const COMMISSION_MODE_RATE = 1;
+    const COMMISSION_MODE_FIXED = 2;
+
+    const ONLINE_STATUS_OPEN = 1;
+    const ONLINE_STATUS_STOP = 2;
+    const ONLINE_STATUS_EXPIRE = 3;
+
     public static function getRecord($where, $colums = [])
     {
         if (empty($colums)) {

application/services/goods/GoodsService.php

@@ -23,6 +23,7 @@ use App\Models\goods\mysql\LifeAccountShopNum;
 use App\Models\goods\mysql\PaySuccessGoodsCallbackRecord;
 use App\Models\goods\mysql\Shop;
 use App\Models\marketing\mysql\Distributor;
+use App\Models\marketing\mysql\Marketing;
 use App\Models\marketing\mysql\MarketingGoods;
 use App\Models\shop\mysql\SubShop;
 use App\Services\marketing\DistributorService;
@@ -657,9 +658,15 @@ class GoodsService
             "inventory_rest" => $inventoryCount,
             "original_price" => empty($params["original_price"]) ? 0 : $params["original_price"] * 100,
             "price" => $params["price"] * 100,
+            "clear_price" => empty($params["clear_price"]) ? 0 : $params["clear_price"] * 100,
             "goods_version" => (int)$skuData["goods_version"] + 1,
         ];
 
+        //验证结算价格
+        if (!empty($params["clear_price"])) {
+            self::checkClearPrice($goodsSkuId, $skuParams);
+        }
+
         if (self::isInitGoodsStatus($params, $skuData)) {
             $skuParams["audit_status"] = GoodsSku::STATUS_AUDIT;
             $skuParams["online_status"] = GoodsSku::ONLINE_STATUS_NO_ONLINE;
@@ -687,6 +694,48 @@ class GoodsService
         return GoodsSku::save($skuParams, ["goods_sku_id" => $goodsSkuId]);
     }
 
+    /**
+     * 检查结算价格
+     * @param $goodsSkuId
+     * @param $skuParams
+     * @throws GoodsException
+     */
+    private static function checkClearPrice($goodsSkuId, $skuParams)
+    {
+        $clearPrice = $skuParams["clear_price"];
+        $price = $skuParams["price"];
+        if ($clearPrice > 0 && $clearPrice > $price) {
+            throw new GoodsException(['cus' => 35]);
+        }
+
+        $marketingIds = MarketingGoods::select(["marketing_id"], ["goods_sku_id" => $goodsSkuId]);
+        if (!empty($marketingIds)) {
+            $marketingIds = array_column($marketingIds, "marketing_id");
+            $marketings = Marketing::select("*", [
+                "marketing_id" => $marketingIds,
+                "marketing_type"=> Marketing::MARKETING_TYPE_FENXIAO,
+                "online_status" => Marketing::ONLINE_STATUS_OPEN]
+            );
+
+            if (!empty($marketings)) {
+                foreach ($marketings as $marketing) {
+                    if ($marketing["commission_mode"] == Marketing::COMMISSION_MODE_RATE) {
+                        $commissionTotal = ($marketing["first_commission_value"] + $marketing["second_commission_value"]) / 1000 * $price;
+                        if ($price - $commissionTotal < $clearPrice) {
+                            throw new GoodsException(['cus' => 36]);
+                        }
+                    }
+                    if ($marketing["commission_mode"] == Marketing::COMMISSION_MODE_FIXED) {
+                        $commissionTotal = ($marketing["first_commission_value"] + $marketing["second_commission_value"]);
+                        if ($price - $commissionTotal < $clearPrice) {
+                            throw new GoodsException(['cus' => 36]);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * 是否要初始化状态
      * @param $params
@@ -707,7 +756,8 @@ class GoodsService
             || $params["rule_desc"] != $sku["rule_desc"]
             || $params["rule_refund"] != $sku["rule_refund"]
             || $params["original_price"] != $sku["original_price"]
-            || $params["price"] != $sku["price"];
+            || $params["price"] != $sku["price"]
+            || $params["clear_price"] != $sku["clear_price"];
     }
 
     /**