mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新地址处理

Browse Source
This commit is contained in:
yaooo 2023-08-07 15:00:42 +08:00
parent 702e55fa7f
commit c175b10c13
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controller/api/user/UserAddress.php
View File

@ -57,10 +57,6 @@ class UserAddress extends BaseController
return app('json')->fail('地址不存在'); return app('json')->fail('地址不存在');
} }
$addinfo = $this->repository->get($id, $uid); $addinfo = $this->repository->get($id, $uid);
/*
"brigade_id": 10,
"brigade": "10队"
*/
$area = []; $area = [];
if (!empty($addinfo['province_id'])) { if (!empty($addinfo['province_id'])) {
$province = GeoProvince::where('province_id', $addinfo['province_id'])->find(); $province = GeoProvince::where('province_id', $addinfo['province_id'])->find();
@ -210,9 +206,9 @@ class UserAddress extends BaseController
*/ */
public function checkParams(validate $validate) public function checkParams(validate $validate)
{ {
$data = $this->request->params(['address_id', 'real_name', 'phone', 'area', 'detail', 'post_code', 'is_default']); $data = $this->request->params(['address_id', 'real_name', 'phone', 'area', 'detail', 'post_code', 'is_default', 'brigade']);
$validate->check($data); $validate->check($data);
[$province, $city, $district, $street, $village, $brigade] = ((array)$data['area']) + [null, null, null, null, null, null]; [$province, $city, $district, $street, $village] = ((array)$data['area']) + [null, null, null, null, null];
$last = $village ?? $street ?? $district ?? $city ?? $province; $last = $village ?? $street ?? $district ?? $city ?? $province;
if (!$last) { if (!$last) {
throw new ValidateException('请选择正确的收货地址'); throw new ValidateException('请选择正确的收货地址');
@ -234,6 +230,7 @@ class UserAddress extends BaseController
$data['village'] = $village['name'] ?? ''; $data['village'] = $village['name'] ?? '';
$data['village_id'] = $village['id'] ?? 0; $data['village_id'] = $village['id'] ?? 0;
} }
$brigade = $data['brigade'];
if (isset($brigade)) { if (isset($brigade)) {
$data['brigade'] = $brigade['name'] ?? ''; $data['brigade'] = $brigade['name'] ?? '';
$data['brigade_id'] = $brigade['id'] ?? 0; $data['brigade_id'] = $brigade['id'] ?? 0;