From c963605163f4fbf91565fa5e319a17fe2545fdb4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 06 十二月 2024 19:32:09 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserAddressController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 413df90..c8b2c71 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
@@ -85,6 +85,7 @@
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);
@@ -140,6 +141,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);
}
@@ -150,7 +154,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