diff --git a/src/main/java/com/example/takeawaysystemserver/controller/UserController.java b/src/main/java/com/example/takeawaysystemserver/controller/UserController.java index 43bfe68..45a308c 100644 --- a/src/main/java/com/example/takeawaysystemserver/controller/UserController.java +++ b/src/main/java/com/example/takeawaysystemserver/controller/UserController.java @@ -65,4 +65,10 @@ public class UserController { public R addAddress(@RequestHeader String token, @RequestBody AddressDTO addressDTO){ return userService.addAddress(token, addressDTO); } + + @PostMapping("update-addr") + @ApiOperation(value = "更新用户地址") + public R updateAddr(@RequestHeader String token, @RequestParam("address")String addr){ + return userService.updateAddress(token, addr); + } } diff --git a/src/main/java/com/example/takeawaysystemserver/entity/User.java b/src/main/java/com/example/takeawaysystemserver/entity/User.java index 375093e..e61b74e 100644 --- a/src/main/java/com/example/takeawaysystemserver/entity/User.java +++ b/src/main/java/com/example/takeawaysystemserver/entity/User.java @@ -44,6 +44,11 @@ public class User implements Serializable { */ private Integer status; + /** + * 用户地址 + */ + private String address; + private static final long serialVersionUID = 1L; @Override diff --git a/src/main/java/com/example/takeawaysystemserver/service/UserService.java b/src/main/java/com/example/takeawaysystemserver/service/UserService.java index 75aaf79..b63433b 100644 --- a/src/main/java/com/example/takeawaysystemserver/service/UserService.java +++ b/src/main/java/com/example/takeawaysystemserver/service/UserService.java @@ -64,4 +64,12 @@ public interface UserService extends IService { * @return 添加信息 */ R addAddress(String token, AddressDTO addressDTO); + + /** + * 修改用户地址 + * @param token 用户token + * @param address 地址 + * @return 更新信息 + */ + R updateAddress(String token, String address); } diff --git a/src/main/java/com/example/takeawaysystemserver/service/impl/OrderServiceImpl.java b/src/main/java/com/example/takeawaysystemserver/service/impl/OrderServiceImpl.java index 000a400..d65129e 100644 --- a/src/main/java/com/example/takeawaysystemserver/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/example/takeawaysystemserver/service/impl/OrderServiceImpl.java @@ -56,12 +56,10 @@ public class OrderServiceImpl extends ServiceImpl if (shoppingCarts == null || shoppingCarts.isEmpty()){ return R.fail(CommonStatusConstant.SHOPPINGCART_ERROR); } - System.out.println(order); User user = userService.getById(id); Integer addressId = order.getAddressId(); - Address address = addressService.getById(addressId); - System.out.println(address); + String address = user.getAddress(); if (address == null){ return R.fail(CommonStatusConstant.ADDRESS_ERROR); } @@ -81,21 +79,15 @@ public class OrderServiceImpl extends ServiceImpl order.setId(orderId); order.setUserId(id); - order.setAddress((address.getProvince() == null ? "" : address.getProvince()) - + (address.getCity() == null ? "" : address.getCity()) - + (address.getDistrict() == null ? "" : address.getDistrict()) - + (address.getDetail() == null ? "" : address.getDetail())); - System.out.println(order); + order.setAddress(address); boolean save = this.save(order); if (!save){ return R.fail(CommonStatusConstant.INSERT_ERROR); } - boolean b = orderItemService.saveBatch(orderItems); if (!b){ return R.fail(CommonStatusConstant.INSERT_ERROR); } - shoppingCartService.remove(wrapper); return R.ok("添加成功"); diff --git a/src/main/java/com/example/takeawaysystemserver/service/impl/UserServiceImpl.java b/src/main/java/com/example/takeawaysystemserver/service/impl/UserServiceImpl.java index 3fc6d12..190a00c 100644 --- a/src/main/java/com/example/takeawaysystemserver/service/impl/UserServiceImpl.java +++ b/src/main/java/com/example/takeawaysystemserver/service/impl/UserServiceImpl.java @@ -149,6 +149,18 @@ public class UserServiceImpl extends ServiceImpl } } + @Override + public R updateAddress(String token, String address) { + Integer id = Integer.parseInt(getUserId(token)); + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(User::getId, id).set(User::getAddress, address); + if (baseMapper.update(wrapper) == 1){ + return R.ok("修改成功"); + }else { + return R.fail("修改失败"); + } + } + private Boolean checkUser(UserRegisterDTO userRegisterDTO){ User user = baseMapper.selectOne(new LambdaQueryWrapper() .select(User::getUsername)