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

application/library/Validate/TakePlaceValidate.php

@@ -15,6 +15,7 @@ class TakePlaceValidate extends \Validate\BaseValidate
         'take_place_id' => 'require',
         'name' => 'require',
         'address' => 'require',
+        'location' => 'require',
         'longitude' => 'require',
         'latitude' => 'require',
         'province' => 'require',
@@ -29,7 +30,8 @@ class TakePlaceValidate extends \Validate\BaseValidate
         "take_place_id" => "take_place_id不能为空",
         "marketing_id" => "marketing_id不能为空",
         "name" => "自提点名称不能为空",
-        "address" => "详细地址不能为空",
+        "address" => "详细地址(原商圈)不能为空",
+        "location" => "高德地图详细地址不能为空",
         "longitude" => "经度不能为空",
         "latitude" => "纬度不能为空",
         "province" => "省不能为空",

application/services/marketing/TakePlaceService.php

@@ -56,6 +56,7 @@ class TakePlaceService
         $data['take_place_name'] = $params['name'];
         $data['longitude'] = $params['longitude'];
         $data['latitude'] = $params['latitude'];
+        $data['location'] = $params['location'];
         $data['address'] = $params['address'];
         $data['contact_name'] = $params['contact_name'] ?? '';
         $data['phone'] = $params['phone'] ?? '';