Merge branch 'test' of https://git.yidian-inc.com:8021/bp/goods into test

application/modules/Marketing/controllers/Marketing.php

@@ -212,6 +212,7 @@ class MarketingController extends Base
         $this->params['sort_field'] = 'end_time';
         $this->params['sort_type'] = 'desc';
         $this->params['need_buy_num'] = false;
+        $this->params['online_status'] = [Marketing::ONLINE_STATUS_QIDONG,Marketing::ONLINE_STATUS_GUANBI];//状态 ， 1启用，2关闭，3 到期
         $this->params['activity_status'] = MarketingPindan::ACTIVITY_STATUS_FINISHED;//1 未开始，2进行中，3已结束, 4当日上新（即将开始）
         $list['end'] = MarketingService::marketingList($this->params)['result'];
         $list['end'] = $list['end'] ? array_column($list['end'], null, 'marketing_id') : [];

application/services/goods/GoodsService.php

@@ -157,11 +157,6 @@ class GoodsService
             throw new GoodsException(['cus' => 2]);
         }
         $spuId = $res[0];
-        $checkName = self::checkGoodsName($spuData["goods_name"], $spuData["life_account_id"]);
-        if (!$checkName["can_use"]) {
-            throw new GoodsException(['cus' => 17]);
-        }
-
         $spuParams = [
             "goods_spu_id" => $spuId,
             "shop_id" => $shopId,
@@ -771,13 +766,6 @@ class GoodsService
      */
     private static function editGoodsSpu($goodsSpu, $params = [])
     {
-
-
-        $checkName = self::checkGoodsName($params["goods_name"], $goodsSpu["life_account_id"], $goodsSpu["goods_spu_id"]);
-        if (!$checkName["can_use"]) {
-            throw new GoodsException(['cus' => 17]);
-        }
-
         return GoodsSpu::save([
             "goods_name" => $params["goods_name"],
             "desc_pic_url" => $params["desc_pic_url"],

application/services/goods/MarketingPindanGoodsService.php

@@ -165,12 +165,6 @@ class MarketingPindanGoodsService
      */
     private static function addGoodsSku($spuData, $shopId, $skuData = [])
     {
-        $pindanSku = PindanGoodsSku::get("goods_sku_id", ["goods_name" => $skuData["goods_name"]
-            , "life_account_id" => $skuData["life_account_id"]]);
-        if (!empty($pindanSku)) {
-            throw new GoodsException(['cus' => 17]);
-        }
-
         $res = GoodsService::getIdgenId(substr($shopId, -2), "goods");
         if (empty($res)) {
             throw new GoodsException(['cus' => 2]);
@@ -267,11 +261,6 @@ class MarketingPindanGoodsService
      */
     private static function editGoodsSpu($goodsSpu, $params = [])
     {
-        $checkName = GoodsService::checkGoodsName($params["goods_name"], $goodsSpu["life_account_id"], $goodsSpu["goods_spu_id"]);
-        if (!$checkName["can_use"]) {
-            throw new GoodsException(['cus' => 17]);
-        }
-
         return GoodsSpu::save([
             "desc_pic_url" => $params["desc_pic_url"],
             "desc" => $params["desc"],