Merge branch 'jielong' into test

.gitignore

 composer.lock
-/yaconf/
+/yaconf
 .idea
 .DS_Store
 .project

application/exception/custom/GoodsException.php

@@ -43,7 +43,7 @@ class GoodsException extends BaseException
         24 => '当前商品库存不足',
         25 => '开始时间格式不对',
         26 => '结束时间格式不对',
-        27 => 'TCC调用失败',
+        27 => '调用商品系统调用失败',
         28 => '上架状态不能编辑，需先下架，再做编辑操作',
         29 => '发布商品的生活号不存在',
         30 => '当前商品已过期',
@@ -58,10 +58,10 @@ class GoodsException extends BaseException
         39 => '结算价不能大于售价',
         40 => '结算价不符合标准',
         41 => '商品id非法',
-        42 => 'TCC 参数错误',
-        43 => 'TCC 商品非上架状态',
-        44 => 'TCC 事务commit失败',
-        45 => 'TCC 还没有try，就去执行confirm',
-        46 => 'TCC 已经执行过cancel',
+        42 => '调用商品系统参数错误',
+        43 => '商品非上架状态',
+        44 => '事务commit失败',
+        45 => '还没有try，就去执行confirm',
+        46 => '已经执行过cancel',
     ];
 }
\ No newline at end of file

application/services/marketing/MarketingService.php

@@ -891,6 +891,8 @@ class MarketingService
         $lifeAccountList = CommonService::getlifeAccountList(['life_account_id' => [$pindanMarketing["publish_life_account_id"]]]);
 
         $goodsSkuList = MarketingGoods::marketingGoodsList(['marketing_id' => $params['marketing_id']]);
+        $goodsSkuList = !empty($goodsSkuList) ? $goodsSkuList : [];
+
         $goodsSkuId = array_column($goodsSkuList , 'goods_sku_id');
         $goodsSkuList = PindanGoodsSku::select('*', ['goods_sku_id' => $goodsSkuId]);