Merge branch 'feature_take_place_20210916' into develop

application/modules/Marketing/controllers/Marketing.php

@@ -202,7 +202,7 @@ class MarketingController extends Base
     private function getTuanCanEndList(){
         try{
             $redis = RedisUtil::getInstance('cache',['serializer'=>'none']);
-            $key = "tuancan_endlist_in_".date('Ymd');
+            $key = "tuancan_end_list_in_".date('Ymd');
             $list['end'] = $redis->get($key);
 
             if(empty($list['end'])) {

application/services/marketing/TakePlaceService.php

@@ -168,9 +168,9 @@ class TakePlaceService
         $data['province'] = $params['province'];
         $data['city'] = $params['city'];
         $data['area'] = $params['area'];
-        $data['tag_id'] = $params['tag_id'];
-        $data['business_circle_id'] = $params['business_circle_id'];
-        $data['lunch_deliver_time'] = $params['lunch_deliver_time'];
+        $data['tag_id'] = empty($params['tag_id']) ? 0 : $params['tag_id'];
+        $data['business_circle_id'] = empty($params['business_circle_id']) ? 0 : $params['business_circle_id'];
+        $data['lunch_deliver_time'] = empty($params['lunch_deliver_time']) ? null : $params['lunch_deliver_time'];
 
         return TakePlace::insert($data);
     }
@@ -228,8 +228,21 @@ class TakePlaceService
         $page = $params['page'] ?? 1;
         $limit = $params['limit'] ?? 20;
 
-        $offset = ($page - 1) * $limit;
-        $res = ['list' => [], 'total' => 0];
+        //兼容客户端传递NaN字符串的问题
+        if(!empty($longitude) && !is_numeric($longitude)) {
+            $longitude = '';
+        }
+        if(!empty($latitude) && !is_numeric($latitude)) {
+            $latitude = '';
+        }
+        //经纬度小程序调用时前后端都是反的，客户端按正确顺序传，程序把参数反过来，小程序目前来不及改，暂时先按反着的来
+        //临时交换客户端传过来的经纬度的值 @todo 后期前后端一起修正传参后去掉此逻辑（注意小程序版本控制）
+        if(isset($params['appid']) && $params['appid'] == 'merchant-c') {
+            list($longitude,$latitude) = [$latitude,$longitude];
+        }
+
+        $offset = ($page-1)*$limit;
+        $res = ['list'=>[],'total'=>0];
 
         $where = ['marketing_id' => $marketingId];