Commit be24ea78 authored by jianghaiming's avatar jianghaiming

update:set

parent 213a227a
...@@ -30,6 +30,7 @@ class MarketingService ...@@ -30,6 +30,7 @@ class MarketingService
*/ */
public static function getPublicLifeAccountId() public static function getPublicLifeAccountId()
{ {
/**
$env = \Yaf\Application::app()->environ(); $env = \Yaf\Application::app()->environ();
if (in_array($env, ['dev'])) { if (in_array($env, ['dev'])) {
$lifeAccountId = "13076446786650120"; $lifeAccountId = "13076446786650120";
...@@ -39,6 +40,8 @@ class MarketingService ...@@ -39,6 +40,8 @@ class MarketingService
// $lifeAccountId = self::ONLINE_LIFE_ACCOUNT_ID; // $lifeAccountId = self::ONLINE_LIFE_ACCOUNT_ID;
$lifeAccountId = self::ONLINE_LIFE_ACCOUNT_ID_TEST;//测试用 $lifeAccountId = self::ONLINE_LIFE_ACCOUNT_ID_TEST;//测试用
} }
*/
$lifeAccountId = config('lifeaccount','life_account_id');
return $lifeAccountId; return $lifeAccountId;
} }
...@@ -409,6 +412,8 @@ class MarketingService ...@@ -409,6 +412,8 @@ class MarketingService
throw new MarketingException(['cus'=>14]); throw new MarketingException(['cus'=>14]);
} }
$lifeAccountId = config('lifeaccount','life_account_id');
$tmpMarketingId = []; $tmpMarketingId = [];
$tmpGoodsSkuId = []; $tmpGoodsSkuId = [];
$goodsData = [ $goodsData = [
...@@ -472,6 +477,7 @@ class MarketingService ...@@ -472,6 +477,7 @@ class MarketingService
'update_time' => date("Y-m-d H:i:s"), 'update_time' => date("Y-m-d H:i:s"),
'create_time' => date("Y-m-d H:i:s"), 'create_time' => date("Y-m-d H:i:s"),
'commission_mode' => $commissionMode, 'commission_mode' => $commissionMode,
'life_account_id' => $lifeAccountId,
]; ];
$marketingId = Marketing::insertRecord($colums); $marketingId = Marketing::insertRecord($colums);
if (empty($marketingId)) { if (empty($marketingId)) {
...@@ -538,8 +544,8 @@ class MarketingService ...@@ -538,8 +544,8 @@ class MarketingService
$type = Marketing::MARKETING_TYPE_PINDAN; $type = Marketing::MARKETING_TYPE_PINDAN;
$goodsSkuId = !empty($params['goods_sku_id']) ? explode(",", $params['goods_sku_id']) : []; $goodsSkuId = !empty($params['goods_sku_id']) ? explode(",", $params['goods_sku_id']) : [];
$takePlaceIds = !empty($params['take_place_ids']) ? explode(",", $params['take_place_ids']) : []; $takePlaceIds = !empty($params['take_place_ids']) ? explode(",", $params['take_place_ids']) : [];
$publicLifeAccountId = self::getPublicLifeAccountId(); //$publicLifeAccountId = self::getPublicLifeAccountId();
$lifeAccountId = config('lifeaccount','life_account_id');
if (empty($marketingName)) { if (empty($marketingName)) {
throw new MarketingException(['cus' => 0]); throw new MarketingException(['cus' => 0]);
} }
...@@ -593,6 +599,7 @@ class MarketingService ...@@ -593,6 +599,7 @@ class MarketingService
'update_user_email' => $createUserEmail, 'update_user_email' => $createUserEmail,
'update_time' => date("Y-m-d H:i:s"), 'update_time' => date("Y-m-d H:i:s"),
'create_time' => date("Y-m-d H:i:s"), 'create_time' => date("Y-m-d H:i:s"),
'life_account_id' => $lifeAccountId
]; ];
$marketingId = Marketing::insertRecord($marketingParams); $marketingId = Marketing::insertRecord($marketingParams);
if (empty($marketingId)) { if (empty($marketingId)) {
...@@ -602,7 +609,7 @@ class MarketingService ...@@ -602,7 +609,7 @@ class MarketingService
$pindanParams = [ $pindanParams = [
"marketing_id" => $marketingId, "marketing_id" => $marketingId,
"publish_life_account_id" => $publicLifeAccountId, "publish_life_account_id" => $lifeAccountId,
"pindan_pic" => $pindanPic, "pindan_pic" => $pindanPic,
"pindan_desc" => $pindanDesc, "pindan_desc" => $pindanDesc,
"min_price" => $minPrice, "min_price" => $minPrice,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment