From 7d797c3f197371bb66c8ed3e60327817e9f0364c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 28 八月 2024 13:57:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java
index cf9948c..d779300 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java
@@ -66,8 +66,10 @@
public AjaxResult<TAppUserAddress> queryDefaultAddress() {
// 用户id
Long userId = tokenService.getLoginUserApplet().getUserId();
- return AjaxResult.ok(appUserAddressService.getOne(Wrappers.<TAppUserAddress>lambdaQuery().eq(TAppUserAddress::getAppUserId, userId)
- .eq(TAppUserAddress::getDefaultAddress,1)));
+ TAppUserAddress appUserAddress = appUserAddressService.getOne(Wrappers.<TAppUserAddress>lambdaQuery().eq(TAppUserAddress::getAppUserId, userId)
+ .eq(TAppUserAddress::getDefaultAddress, 1));
+ appUserAddress.setUid(appUserAddress.getId().toString());
+ return AjaxResult.ok(appUserAddress);
}
@@ -110,6 +112,17 @@
}
/**
+ * 通过地址id 查询地址信息
+ * @param id
+ * @return
+ */
+ @ApiOperation(tags = {"小程序-用户地址"},value = "查询用户地址详情")
+ @GetMapping(value = "/getDetailById")
+ public R<TAppUserAddress> getDetailById(@RequestParam(value = "id")Long id) {
+ return R.ok(appUserAddressService.getById(id));
+ }
+
+ /**
* 删除用户地址
*/
@ApiOperation(tags = {"小程序-用户地址"},value = "删除用户地址")
--
Gitblit v1.7.1