From 2bc35df79fca920ad584a82b5ea7b35b6ca7b8a0 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 10:12:57 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserAddressController.java | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserAddressController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserAddressController.java
index 596eb2d..67e2f25 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserAddressController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserAddressController.java
@@ -62,31 +62,60 @@
@ResponseBody
@PostMapping("/add")
@ApiOperation(value = "添加", tags = {"小程序-个人中心首页-我的地址"})
- public R add(@RequestBody UserAddress userAddress){
+ public R<String> add(@RequestBody UserAddress userAddress){
Long userId = tokenService.getLoginUserApplet().getUserid();
+ if (userAddress.getIsDefault()==1){
+ List<UserAddress> list = userAddressService.lambdaQuery().eq(UserAddress::getAppUserId, userId).list();
+ for (UserAddress userAddress1 : list) {
+ userAddress1.setIsDefault(0);
+ }
+ userAddressService.updateBatchById(list);
+ }
userAddress.setAppUserId(userId);
userAddressService.save(userAddress);
- return R.ok();
+ return R.ok(userAddress.getId().toString());
}
+
+ @ResponseBody
+ @GetMapping("/list")
+ @ApiOperation(value = "列表", tags = {"小程序-个人中心首页-我的地址"})
+ public R list(){
+ Long userId = tokenService.getLoginUserApplet().getUserid();
+ List<UserAddress> list = userAddressService.lambdaQuery().eq(UserAddress::getAppUserId, userId).orderByDesc(UserAddress::getIsDefault).list();
+ for (UserAddress userAddress : list) {
+ userAddress.setIdStr(userAddress.getId().toString());
+ userAddress.setUid(userAddress.getId().toString());
+ }
+ return R.ok(list);
+ }
+
@ResponseBody
@PostMapping("/edit")
@ApiOperation(value = "编辑", tags = {"小程序-个人中心首页-我的地址"})
public R edit(@RequestBody UserAddress userAddress){
+ Long userId = tokenService.getLoginUserApplet().getUserid();
+ if (userAddress.getIsDefault()==1){
+ List<UserAddress> list = userAddressService.lambdaQuery().eq(UserAddress::getAppUserId, userId).list();
+ for (UserAddress userAddress1 : list) {
+ userAddress1.setIsDefault(0);
+ }
+ userAddressService.updateBatchById(list);
+ }
userAddressService.updateById(userAddress);
return R.ok();
}
@ResponseBody
- @PostMapping("/delete")
+ @GetMapping("/delete")
@ApiOperation(value = "删除", tags = {"小程序-个人中心首页-我的地址"})
- public R edit(@RequestParam Integer id){
+ public R edit(@RequestParam String id){
userAddressService.removeById(id);
return R.ok();
}
@ResponseBody
- @PostMapping("/set")
+ @GetMapping("/set")
@ApiOperation(value = "设为默认", tags = {"小程序-个人中心首页-我的地址"})
- public R set(@RequestParam Integer id){
+ public R set(@RequestParam String id){
Long userId = tokenService.getLoginUserApplet().getUserid();
List<UserAddress> list = userAddressService.lambdaQuery().eq(UserAddress::getAppUserId, userId).list();
for (UserAddress userAddress : list) {
@@ -110,6 +139,9 @@
public R<List<UserAddress>> getUserAddressList(){
Long userId = tokenService.getLoginUserApplet().getUserid();
List<UserAddress> list = userAddressService.lambdaQuery().eq(UserAddress::getAppUserId, userId).list();
+ for (UserAddress userAddress : list) {
+ userAddress.setIdStr(userAddress.getId().toString());
+ }
return R.ok(list);
}
@@ -120,7 +152,7 @@
*/
@ResponseBody
@PostMapping("/getUserAddressById")
- public R<UserAddress> getUserAddressById(@RequestParam("id") Integer id){
+ public R<UserAddress> getUserAddressById(@RequestParam("id") Long id){
UserAddress userAddress = userAddressService.getById(id);
return R.ok(userAddress);
}
--
Gitblit v1.7.1