Merge branch 'jielong' into test

# Conflicts:
#	application/services/marketing/TakePlaceService.php

application/modules/Marketing/controllers/Takeplace.php

@@ -19,6 +19,20 @@ class TakeplaceController extends Base
         $res = TakePlaceService::detail($this->params['take_place_id']);
         $this->success(['result'=>$res]);
     }
+
+    /**
+     * 批量获取自提点信息
+     * @throws Exception
+     */
+    public function get_detail_by_idsAction()
+    {
+        if (empty($this->params['take_place_ids'])) {
+            $this->success(['result'=>[]]);
+        }
+        $res = TakePlaceService::getDetailByIds($this->params['take_place_ids']);
+
+        $this->success(['result'=>$res]);
+    }
     
     /**
      * 获取自提点列表

application/services/marketing/TakePlaceService.php

@@ -34,6 +34,17 @@ class TakePlaceService
         return TakePlace::get('*',['take_place_id'=>$takePlaceId]);
     }
 
+    /**
+     * 批量获取自提点信息
+     * @param $takePlaceIds
+     * @return \Api\PhpUtils\Mysql\MysqlBase
+     */
+    public static function getDetailByIds($takePlaceIds)
+    {
+        $result = TakePlace::select('*',['take_place_id'=>$takePlaceIds]);
+        return $result ? array_column($result,null,'take_place_id') : [];
+    }
+
     /**
      * 添加自提点
      * @param $params
@@ -124,7 +135,6 @@ class TakePlaceService
 
         $where = ['marketing_id' => $marketingId];
         
-
         if($keywords) {
 //            $where['OR'] = [
 //                'take_place_name[~]' => $keywords,
@@ -145,11 +155,10 @@ class TakePlaceService
         $makePlaceIds = array_column($relations,'take_place_id');
         $takePlaceWhere = ['take_place_id'=>$makePlaceIds];
 
-        if (!empty($params['is_delete']) && $params['is_delete'] == 1) {
-
-            $takePlaceWhere['is_delete'] = 0;  
+        if ( !isset($params['has_delete']) ) {
+            $takePlaceWhere['is_delete'] = 0;
         }
-        
+
         //本页按距离返回列表
         $res['list'] = self::sortByDistance($latitude,$longitude,TakePlace::select('*', $takePlaceWhere));