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

application/modules/Marketing/controllers/Marketinggoods.php

@@ -82,6 +82,13 @@ class MarketinggoodsController extends Base
         $this->success($result);
     }
 
+    public function get_marketing_goods_listAction()
+    {
+        $params = $this->params;
+        $list = MarketingGoodsService::getMarketingGoodsList($params);
+        $this->success($list);
+    }
+    
  
 
 }
\ No newline at end of file

application/services/marketing/MarketingGoodsService.php

@@ -15,6 +15,39 @@ use App\Services\common\CommonService;
 use Api\PhpServices\Sensitive\Sensitive;
 class MarketingGoodsService
 {
+    public static function getMarketingGoodsList($params)
+    {
+        $goodsSkuId = !empty($params['goods_sku_id']) ? $params['goods_sku_id'] : '';
+        $marketingWhere = [];
+        $where = [
+            'goods_sku_id' => $goodsSkuId,
+        ];
+        $data = MarketingGoods::marketingGoodsList($where);
+
+        if (!empty($data)) {
+           $marketingId = array_column($data, 'marketing_id');
+           $marketingWhere['marketing_id'] = !empty($marketingId) ? $marketingId : [];
+        }
+        
+        $marketingList = Marketing::getMarketingList($marketingWhere);
+        $marketingList = array_column($marketingList,null,'marketing_id');        
+        $list = [];
+        foreach ($data as $key => $value) {
+            $marketing = !empty($marketingList[$value['marketing_id']]) ? $marketingList[$value['marketing_id']] : [];
+            $list[$key] = $value;
+            $list[$key]['marketing_name'] = !empty($marketing['marketing_name']) ? $marketing['marketing_name'] : '';
+            $list[$key]['commission_mode'] = !empty($marketing['commission_mode']) ? $marketing['commission_mode'] : '';
+            $list[$key]['first_commission_value'] = !empty($marketing['first_commission_value']) ? $marketing['first_commission_value'] : '';
+            $list[$key]['second_commission_value'] = !empty($marketing['second_commission_value']) ? $marketing['second_commission_value'] : '';
+            $list[$key]['create_user_email'] = !empty($marketing['create_user_email']) ? $marketing['create_user_email'] : '';
+            $list[$key]['good_count'] = !empty($marketing['good_count']) ? $marketing['good_count'] : '';
+            $list[$key]['start_time'] = !empty($marketing['start_time']) ? $marketing['start_time'] : '';
+            $list[$key]['end_time'] = !empty($marketing['end_time']) ? $marketing['end_time'] : '';
+            $list[$key]['online_status'] = !empty($marketing['online_status']) ? $marketing['online_status'] : '';
+            $list[$key]['marketing_type'] = !empty($marketing['marketing_type']) ? $marketing['marketing_type'] : '';
+        }
+        return ['result' => $list];
+    }
     public static function marketingGoodsList($params)
     {   
         $limit = !empty($params['num']) ? $params['num'] : 20;