Merge branch 'test'

application/services/goods/GoodsService.php

@@ -327,6 +327,8 @@ class GoodsService
         $status = $params["audit_status"];
         $operatorId = empty($params["user_id"]) ? 0 : $params["user_id"];
         $operatorName = $params["user_name"];
+        //为避免下边逻辑判断复杂
+        $params["rejected_reason"] = isset($params["rejected_reason"]) ? $params["rejected_reason"] : '';
 
         $goodsSpu = GoodsSpu::get("*", ["goods_spu_id" => $goodsSpuId]);
         if (empty($goodsSpu)) {

application/services/marketing/MarketingService.php

@@ -25,7 +25,7 @@ class MarketingService
     {
         $startTime = !empty($params['start_time']) ? $params['start_time'] : '';
         $endTime = !empty($params['end_time']) ? $params['end_time'] : '';
-        $goodsSkuId = !empty($params['goods_sku_id']) ? $params['goods_sku_id'] : '';
+        $goodsSpuId = !empty($params['goods_spu_id']) ? $params['goods_spu_id'] : '';
         $lifeAccountId = !empty($params['life_account_id']) ? $params['life_account_id'] : '';
 
         if (empty($startTime)) {
@@ -79,8 +79,8 @@ class MarketingService
             $where['goods_sku_id[!]'] = $tmpGoodsSkuId;
         }
 
-        if (!empty($goodsSkuId)) {
-            $where['goods_sku_id'] = $goodsSkuId;
+        if (!empty($goodsSpuId)) {
+            $where['goods_spu_id'] = $goodsSpuId;
         }
 
         if (!empty($lifeAccountId)) {
@@ -97,6 +97,7 @@ class MarketingService
         $list = [];
         foreach ($goodsSkuList as $key => $value) {
             $list[$key]['goods_sku_id'] = $value['goods_sku_id'];
+            $list[$key]['goods_spu_id'] = $value['goods_spu_id'];
             $list[$key]['life_account_id'] = $value['life_account_id'];
             $list[$key]['goods_name'] = $value['goods_name'];
             $list[$key]['life_account_name'] = !empty($lifeAccountList[$value['life_account_id']]['life_account_name']) ? $lifeAccountList[$value['life_account_id']]['life_account_name'] : '';  
@@ -139,9 +140,9 @@ class MarketingService
             }
         }
 
-        if (!empty($params['goods_sku_id'])) {
-            $goodsSkuId = $params['goods_sku_id'];
-            $marketingGoodsList = MarketingGoods::marketingGoodsList(['goods_sku_id' => $goodsSkuId]);
+        if (!empty($params['goods_spu_id'])) {
+            $goodsSpuId = $params['goods_spu_id'];
+            $marketingGoodsList = MarketingGoods::marketingGoodsList(['goods_spu_id' => $goodsSpuId]);
 
             if (empty($marketingGoodsList)) {
                 $where['marketing_id'] = "-1";
@@ -303,11 +304,11 @@ class MarketingService
         }
         $colums = [];
         $goodCount = !empty($goodsSkuId) ? count($goodsSkuId) : 0;
-
-        foreach ($goodsSkuId as $key => $value) {
+        $goodsSkuList = GoodsSku::select('*', ['goods_sku_id' => $goodsSkuId]);
+        foreach ($goodsSkuList as $key => $value) {
             $colums[$key]['marketing_id'] = $marketingId;
-            $colums[$key]['goods_spu_id'] = '';
-            $colums[$key]['goods_sku_id'] = $value;
+            $colums[$key]['goods_spu_id'] = $value['goods_spu_id'];
+            $colums[$key]['goods_sku_id'] = $value['goods_sku_id'];
             $colums[$key]['update_time'] = date("Y-m-d H:i:s");
             $colums[$key]['create_time'] = date("Y-m-d H:i:s");
         }
@@ -362,6 +363,7 @@ class MarketingService
         if (!empty($goodsSkuList)) {
             foreach ($goodsSkuList as $key => $value) {
                 $list[$key]['goods_sku_id'] = $value['goods_sku_id'];
+                $list[$key]['goods_spu_id'] = $value['goods_spu_id'];
                 $list[$key]['life_account_id'] = $value['life_account_id'];
                 $list[$key]['goods_name'] = $value['goods_name'];
                 $list[$key]['life_account_name'] = !empty($lifeAccountList[$value['life_account_id']]['life_account_name']) ? $lifeAccountList[$value['life_account_id']]['life_account_name'] : '';  

conf/cli.ini

@@ -10,7 +10,7 @@ appid                                       = "goods"
 idgen.partner = "bp"
 idgen.key = "5cfdb867e96374c7883b31d6928cc4cb"
 
-[product : common]
+[prod : common]
 [pre : common ]
 [test: common ]
 [dev : common ]
\ No newline at end of file