From d2542a6123fa6834e01ed3af23c7ba0a02696bc6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 29 十一月 2024 16:37:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserAddressController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 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 c0c0621..8abf416 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
@@ -9,6 +9,16 @@
import javax.annotation.Resource;
import java.util.List;
+import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.UserAddress;
+import com.ruoyi.account.service.UserAddressService;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.service.TokenService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -24,6 +34,9 @@
@Resource
private UserAddressService userAddressService;
+
+ @Resource
+ private TokenService tokenService;
/**
@@ -45,5 +58,47 @@
return R.ok(userAddress);
}
+
+ @ResponseBody
+ @PostMapping("/add")
+ @ApiOperation(value = "添加", tags = {"小程序-个人中心首页-我的地址"})
+ public R add(@RequestBody UserAddress userAddress){
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ userAddress.setAppUserId(userId);
+ userAddressService.save(userAddress);
+ return R.ok();
+ }
+ @ResponseBody
+ @PostMapping("/edit")
+ @ApiOperation(value = "编辑", tags = {"小程序-个人中心首页-我的地址"})
+ public R edit(@RequestBody UserAddress userAddress){
+ userAddressService.updateById(userAddress);
+ return R.ok();
+ }
+ @ResponseBody
+ @PostMapping("/delete")
+ @ApiOperation(value = "删除", tags = {"小程序-个人中心首页-我的地址"})
+ public R edit(@RequestParam Integer id){
+ userAddressService.removeById(id);
+ return R.ok();
+ }
+
+ @ResponseBody
+ @PostMapping("/set")
+ @ApiOperation(value = "设为默认", tags = {"小程序-个人中心首页-我的地址"})
+ public R set(@RequestParam Integer id){
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ List<UserAddress> list = userAddressService.lambdaQuery().eq(UserAddress::getAppUserId, userId).list();
+ for (UserAddress userAddress : list) {
+ userAddress.setIsDefault(0);
+ }
+ userAddressService.updateBatchById(list);
+
+ UserAddress byId = userAddressService.getById(id);
+ byId.setIsDefault(1);
+ userAddressService.updateById(byId);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1