From 45f4118f98840ff098e94a5072a9f937d3810a1c Mon Sep 17 00:00:00 2001
From: 18582019636 <1657978663@qq.com>
Date: 星期五, 21 六月 2024 12:00:03 +0800
Subject: [PATCH] feat: 代码初始化
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserRecipientController.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserRecipientController.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserRecipientController.java
index 0a70ac8..c7662a8 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserRecipientController.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserRecipientController.java
@@ -4,7 +4,7 @@
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.api.model.LoginUserInfo;
import com.ruoyi.user.entity.UserRecipient;
import com.ruoyi.user.service.UserRecipientService;
import io.swagger.annotations.Api;
@@ -40,7 +40,7 @@
@GetMapping(value = "/list")
@ApiOperation(value = "收货地址列表", tags = {"用户端-收货地址管理"})
public R<List<UserRecipient>> list() {
- LoginUser loginUser = tokenService.getLoginUserByUser();
+ LoginUserInfo loginUser = tokenService.getLoginUserByUser();
if (null == loginUser) {
return R.loginExpire("登录失效！");
}
@@ -74,12 +74,14 @@
@ApiOperation(value = "新增收货地址", tags = {"用户端-收货地址管理"})
@PostMapping(value = "/save")
public R<String> save(@RequestBody UserRecipient userRecipient) {
- LoginUser loginUser = tokenService.getLoginUserByUser();
+ LoginUserInfo loginUser = tokenService.getLoginUserByUser();
if (null == loginUser) {
return R.loginExpire("登录失效！");
}
- userRecipient.setUserId(loginUser.getUserid().intValue());
- return recipientService.save(userRecipient) ? R.ok() : R.fail();
+ userRecipient.setUserId(loginUser.getUserid());
+ // 当前新增收货地址为默认地址时
+ boolean result = recipientService.updateBatchAddress(userRecipient, loginUser.getUserid());
+ return result && recipientService.save(userRecipient) ? R.ok() : R.fail();
}
/**
@@ -91,7 +93,13 @@
@ApiOperation(value = "修改收货地址", tags = {"用户端-收货地址管理"})
@PostMapping(value = "/update")
public R<String> update(@RequestBody UserRecipient userRecipient) {
- return recipientService.updateById(userRecipient) ? R.ok() : R.fail();
+ LoginUserInfo loginUser = tokenService.getLoginUserByUser();
+ if (null == loginUser) {
+ return R.loginExpire("登录失效！");
+ }
+ // 当前修改收货地址为默认地址时
+ boolean result = recipientService.updateBatchAddress(userRecipient, loginUser.getUserid());
+ return result && recipientService.updateById(userRecipient) ? R.ok() : R.fail();
}
/**
@@ -105,6 +113,10 @@
@ApiImplicitParam(value = "收货地址id", name = "id", dataType = "String", required = true)
})
public R<String> batchDelete(@RequestParam Integer id) {
+ LoginUserInfo loginUser = tokenService.getLoginUserByUser();
+ if (null == loginUser) {
+ return R.loginExpire("登录失效！");
+ }
return recipientService.lambdaUpdate().set(UserRecipient::getIsDelete, Constants.ONE)
.eq(UserRecipient::getId, id).update() ? R.ok() : R.fail();
}
--
Gitblit v1.7.1