diff --git a/app/Controller/v3/UserAddressController.php b/app/Controller/v3/UserAddressController.php index ff6b41f..7d2f2ca 100644 --- a/app/Controller/v3/UserAddressController.php +++ b/app/Controller/v3/UserAddressController.php @@ -16,7 +16,7 @@ class UserAddressController extends BaseController public function update() { - $userAddressId = $this->request->input('user_address_id',''); + $userAddressId = $this->request->input('user_address_id',0); $user_id = $this->request->input('user_id',''); $user_name = $this->request->input('user_name',''); $address = $this->request->input('address',''); diff --git a/app/Model/v3/UserAddress.php b/app/Model/v3/UserAddress.php index 5b56bd7..abf86e0 100644 --- a/app/Model/v3/UserAddress.php +++ b/app/Model/v3/UserAddress.php @@ -11,6 +11,19 @@ class UserAddress extends Model protected $table = 'lanzu_user_address'; + protected $fillable = [ + 'id', + 'user_id', + 'user_name', + 'address', + 'doorplate', + 'gender', + 'lat', + 'lng', + 'tel', + 'tags' + ]; + protected $casts = [ 'tags' => 'array' ]; diff --git a/app/Service/v3/Implementations/UserAddressService.php b/app/Service/v3/Implementations/UserAddressService.php index 765d8b9..9937df2 100644 --- a/app/Service/v3/Implementations/UserAddressService.php +++ b/app/Service/v3/Implementations/UserAddressService.php @@ -10,17 +10,19 @@ class UserAddressService implements UserAddressServiceInterface public function do($userAddressId,$user_id,$user_name,$address,$doorplate,$gender,$lat,$lng,$tel,$tags) { - $userAddress = UserAddress::query()->find($userAddressId); - $userAddress->user_id = $user_id; - $userAddress->user_name = $user_name; - $userAddress->address = $address; - $userAddress->doorplate = $doorplate; - $userAddress->gender = $gender; - $userAddress->lat = $lat; - $userAddress->lng = $lng; - $userAddress->tel = $tel; - $userAddress->tags = $tags; - return $userAddress->firstOrCreate(); + $userAddress = UserAddress::updateOrCreate(['id' => $userAddressId], + [ + 'user_id' => $user_id, + 'user_name' => $user_name, + 'address' => $address, + 'doorplate' => $doorplate, + 'gender' => $gender, + 'lat' => $lat, + 'lng' => $lng, + 'tel' => $tel, + 'tags' => $tags + ]); + return $userAddress; } public function check() @@ -30,8 +32,7 @@ class UserAddressService implements UserAddressServiceInterface public function undo($userAddressId) { - $userAddress = UserAddress::query()->find($userAddressId); - return $userAddress->delete(); + return UserAddress::destroy($userAddressId); } public function setDefault($userId,$userAddressId) diff --git a/config/routes.php b/config/routes.php index 404bfe8..cd0407b 100644 --- a/config/routes.php +++ b/config/routes.php @@ -127,4 +127,5 @@ Router::addGroup('/v3/', function () { Router::post('userAddress/getList', 'App\Controller\v3\UserAddressController@getList'); Router::post('userAddress/setDefault', 'App\Controller\v3\UserAddressController@setDefault'); Router::post('userAddress/get', 'App\Controller\v3\UserAddressController@get'); + Router::post('userAddress/delete', 'App\Controller\v3\UserAddressController@delete'); },['middleware' => [\App\Middleware\Auth\ApiMiddleware::class, \App\Middleware\Auth\UserMiddleware::class]]); \ No newline at end of file