update 活动绑定自提点接口支持按自提点名称搜索

application/modules/Marketing/controllers/Takeplace.php

@@ -62,11 +62,12 @@ class TakeplaceController extends Base
     {
         (new takePlaceValidate())->scene('bindList')->validate();
 
-        $marketingPindanId = $this->params['marketing_id'];
+        $marketingId = $this->params['marketing_id'];
+        $takePlaceName = $this->params['take_place_name'] ?? '';
         $offset = $this->params['offset'] ?? 0;
         $limit = $this->params['limit'] ?? 20;
 
-        $data = TakePlaceService::getPindanTakePlaceList($marketingPindanId,$offset,$limit);
+        $data = TakePlaceService::getPindanTakePlaceList($marketingId,$takePlaceName,$offset,$limit);
 
         $this->success(['result'=>$data]);
     }

application/services/marketing/TakePlaceService.php

@@ -108,20 +108,25 @@ class TakePlaceService
     /**
      * 获取拼单活动绑定的自提点列表
      * @param $marketingPindanId
+     * @param string $takePlaceName
      * @param int $offset
      * @param int $limit
      * @return array
      */
-    public static function getPindanTakePlaceList($marketingPindanId,$offset=0,$limit=20)
+    public static function getPindanTakePlaceList($marketingPindanId,$takePlaceName='',$offset=0,$limit=20)
     {
+        $res = ['list'=>[],'total'=>0];
         $where = ['marketing_id' => $marketingPindanId];
+        $takePlaceName && $where['take_place_name[~]'] = $takePlaceName;
         $where['ORDER'] = ['marketing_take_place_id' => 'DESC'];
         $where['LIMIT'] = [$offset, $limit];
 
         $relations = MarketingTakePlace::select('*', $where);
-        $makePlaceIds = array_column((array)$relations,'take_place_id');
-
-        $where = ['take_place_id'=>$makePlaceIds,'is_delete'=>TakePlace::STATUS_NORMAL];
+        if(empty($relations)) {
+            return $res;
+        }
+        $makePlaceIds = array_column($relations,'take_place_id');
+        $where = ['take_place_id'=>$makePlaceIds];
 
         $res['list'] = TakePlace::select('*',$where);
         unset($where['ORDER'],$where['LIMIT']);