update 拼单活动列表字段

application/modules/Marketing/controllers/Takeplace.php

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

application/services/marketing/MarketingService.php

@@ -258,7 +258,7 @@ class MarketingService
                 $marketingIds[] = $value["marketing_id"];
             }
 
-            $marketingPindanData = MarketingPindan::select(["marketing_id", "publish_life_account_id", "min_price", "max_price", "pindan_desc"]
+            $marketingPindanData = MarketingPindan::select(["marketing_id", "publish_life_account_id", "min_price", "max_price", "pindan_desc","participate_number"]
                 , ["marketing_id" => $marketingIds]);
             $priceData = [];
             if (!empty($marketingPindanData)) {
@@ -282,6 +282,7 @@ class MarketingService
                     $lists[$key]["min_price"] = $priceData[$value["marketing_id"]]["min_price"];
                     $lists[$key]["max_price"] = $priceData[$value["marketing_id"]]["max_price"];
                     $lists[$key]["pindan_desc"] = $priceData[$value["marketing_id"]]["pindan_desc"];
+                    $lists[$key]["participate_number"] = $priceData[$value["marketing_id"]]["participate_number"];
                 }
             }
         }

application/services/marketing/TakePlaceService.php

@@ -105,18 +105,29 @@ class TakePlaceService
 
     /**
      * 获取拼单活动绑定的自提点列表
-     * @param $marketingPindanId
-     * @param string $takePlaceName
-     * @param int $page
-     * @param int $limit
+     * @param $params
      * @return array
      */
-    public static function getPindanTakePlaceList($marketingPindanId,$takePlaceName='',$page=1,$limit=20)
+    public static function getPindanTakePlaceList($params)
     {
+        $marketingId = $params['marketing_id'];
+        $keywords = $params['keywords'] ?? '';
+        $page = $params['page'] ?? 1;
+        $limit = $params['limit'] ?? 20;
+
         $offset = ($page-1)*$limit;
         $res = ['list'=>[],'total'=>0];
-        $where = ['marketing_id' => $marketingPindanId];
-        $takePlaceName && $where['take_place_name[~]'] = $takePlaceName;
+
+        $where = ['marketing_id' => $marketingId];
+        if($keywords) {
+//            $where['OR'] = [
+//                'take_place_name[~]' => $keywords,
+//                'address[~]' => $keywords,
+//            ];
+            $where = [
+                'take_place_name[~]' => $keywords,
+            ];
+        }
         $where['ORDER'] = ['marketing_take_place_id' => 'DESC'];
         $where['LIMIT'] = [$offset, $limit];