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

application/library/Validate/TakePlaceValidate.php

@@ -26,7 +26,7 @@ class TakePlaceValidate extends \Validate\BaseValidate
 
     protected $message = [
         "take_place_id" => "take_place_id不能为空",
-        "marketing_pindan_id" => "marketing_pindan_id不能为空",
+        "marketing_id" => "marketing_id不能为空",
         "name" => "自提点名称不能为空",
         "address" => "详细地址不能为空",
         "longitude" => "经度不能为空",
@@ -55,6 +55,6 @@ class TakePlaceValidate extends \Validate\BaseValidate
 
     public function sceneBindList()
     {
-        return $this->append(['marketing_pindan_id' => 'require'])->only(['marketing_pindan_id','offset','limit']);
+        return $this->append(['marketing_id' => 'require'])->only(['marketing_id','offset','limit']);
     }
 }
\ No newline at end of file

application/modules/Marketing/controllers/Takeplace.php

@@ -62,7 +62,7 @@ class TakeplaceController extends Base
     {
         (new takePlaceValidate())->scene('bindList')->validate();
 
-        $marketingPindanId = $this->params['marketing_pindan_id'];
+        $marketingPindanId = $this->params['marketing_id'];
         $offset = $this->params['offset'] ?? 0;
         $limit = $this->params['limit'] ?? 20;
 

application/services/marketing/TakePlaceService.php

@@ -114,7 +114,7 @@ class TakePlaceService
      */
     public static function getPindanTakePlaceList($marketingPindanId,$offset=0,$limit=20)
     {
-        $where = ['marketing_pindan_id' => $marketingPindanId];
+        $where = ['marketing_id' => $marketingPindanId];
         $where['ORDER'] = ['marketing_take_place_id' => 'DESC'];
         $where['LIMIT'] = [$offset, $limit];