收货地址
This commit is contained in:
parent
229f875a84
commit
e979884f17
@ -110,7 +110,7 @@ class UserController extends AbstractController
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加用户收获地址列表
|
||||
* 添加用户收获地址
|
||||
* @return ResponseInterface
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
@ -126,7 +126,7 @@ class UserController extends AbstractController
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改用户收获地址列表
|
||||
* 修改用户收获地址
|
||||
* @return ResponseInterface
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
|
||||
@ -16,7 +16,7 @@ class UserRequest extends FormRequest
|
||||
'putUserName' => [ // 修改用户名
|
||||
'user_name',
|
||||
],
|
||||
'addUserAddress' => [ // 添加用户收获地址列表
|
||||
'addUserAddress' => [ // 添加用户收获地址
|
||||
'province_id',
|
||||
'city_id',
|
||||
'county_id',
|
||||
|
||||
@ -10,6 +10,7 @@ use App\Model\UserDoctor;
|
||||
use App\Model\UserDoctorInfo;
|
||||
use App\Model\UserPatient;
|
||||
use App\Model\UserShipAddress;
|
||||
use App\Utils\Mask;
|
||||
use App\Utils\PcreMatch;
|
||||
use Extend\TencentIm\Profile;
|
||||
use Extend\Wechat\Wechat;
|
||||
@ -313,7 +314,7 @@ class UserService extends BaseService
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加用户收获地址列表
|
||||
* 添加用户收获地址
|
||||
* @return array
|
||||
*/
|
||||
public function addUserAddress(): array
|
||||
@ -330,6 +331,9 @@ class UserService extends BaseService
|
||||
|
||||
$area = $areaService->getAreaById($request_params['province_id'],$request_params['city_id'],$request_params['county_id']);
|
||||
|
||||
Db::beginTransaction();
|
||||
|
||||
try {
|
||||
if ($request_params['is_default'] == 1){
|
||||
// 获取默认地址
|
||||
$params = array();
|
||||
@ -337,22 +341,44 @@ class UserService extends BaseService
|
||||
$params['is_default'] = $request_params['is_default'];
|
||||
$user_ship_address = UserShipAddress::getOne($params);
|
||||
if (!empty($user_ship_address)){
|
||||
// 存在默认
|
||||
}
|
||||
}
|
||||
$data = array();
|
||||
$data['is_default'] = 0;
|
||||
|
||||
// 获取默认地址
|
||||
$params = array();
|
||||
$params['address_id'] = $user_ship_address['address_id'];
|
||||
$params['user_id'] = $user_info['user_id'];
|
||||
$params['is_default'] = $request_params['is_default'];
|
||||
$user_ship_address = UserShipAddress::getOne($params);
|
||||
if (empty($user_ship_address)){
|
||||
// 不存在默认
|
||||
}else{
|
||||
// 存在默认
|
||||
UserShipAddress::edit($params,$data);
|
||||
}
|
||||
}
|
||||
|
||||
// 新增
|
||||
$data = array();
|
||||
$data['user_id'] = $user_info['user_id'];
|
||||
$data['province_id'] = $request_params['province_id'];
|
||||
$data['province'] = $area['province']['area_name'];
|
||||
$data['city_id'] = $request_params['city_id'];
|
||||
$data['city'] = $area['city']['area_name'];
|
||||
$data['county_id'] = $request_params['county_id'];
|
||||
$data['county'] = $area['county']['area_name'];
|
||||
$data['address'] = $request_params['address'];
|
||||
$data['address_mask'] = Mask::maskAddressStr($request_params['address']);
|
||||
$data['consignee_name'] = $request_params['consignee_name'];
|
||||
$data['consignee_name_mask'] = Mask::maskNameStr($request_params['consignee_name']);
|
||||
$data['consignee_tel'] = $request_params['consignee_tel'];
|
||||
$data['consignee_tel_mask'] = Mask::maskPhoneStr($request_params['consignee_tel']);
|
||||
$data['is_default'] = $request_params['is_default'];
|
||||
$data['tag'] = $request_params['tag'];
|
||||
$user_ship_address = UserShipAddress::addUserShipAddress($data);
|
||||
if (empty($user_ship_address)){
|
||||
Db::rollBack();
|
||||
return fail(HttpEnumCode::SERVER_ERROR);
|
||||
}
|
||||
|
||||
Db::commit();
|
||||
} catch (\Exception $e) {
|
||||
Db::rollBack();
|
||||
return fail(HttpEnumCode::HTTP_ERROR, $e->getMessage());
|
||||
}
|
||||
|
||||
return success();
|
||||
}
|
||||
|
||||
@ -530,10 +530,10 @@ Router::addGroup('/address', function () {
|
||||
// 获取用户收获地址详情
|
||||
Router::get('/{address_id:\d+}', [UserController::class, 'getUserAddressInfo']);
|
||||
|
||||
// 添加用户收获地址列表
|
||||
// 添加用户收获地址
|
||||
Router::post('', [UserController::class, 'addUserAddress']);
|
||||
|
||||
// 修改用户收获地址列表
|
||||
// 修改用户收获地址
|
||||
Router::put('/{address_id:\d+}', [UserController::class, 'putUserAddress']);
|
||||
|
||||
// 删除用户收获地址列表
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user