From 95b274d2d563a07fa143fc66738ff5d731ee80e3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 11 十月 2024 15:12:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 e2a2dad..2b2d386 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
@@ -70,10 +70,10 @@
TAppUserAddress appUserAddress = appUserAddressService.getOne(Wrappers.<TAppUserAddress>lambdaQuery().eq(TAppUserAddress::getAppUserId, userId)
.eq(TAppUserAddress::getDefaultAddress, 1));
if(Objects.isNull(appUserAddress)){
- return AjaxResult.ok(new TAppUserAddress());
+ return AjaxResult.success();
}
appUserAddress.setUid(appUserAddress.getId().toString());
- return AjaxResult.ok(appUserAddress);
+ return AjaxResult.success(appUserAddress);
}
@@ -125,7 +125,9 @@
@ApiOperation(tags = {"小程序-用户地址"},value = "查询用户地址详情")
@GetMapping(value = "/getDetailById")
public R<TAppUserAddress> getDetailById(@RequestParam(value = "id")Long id) {
- return R.ok(appUserAddressService.getById(id));
+ TAppUserAddress appUserAddress = appUserAddressService.getById(id);
+ appUserAddress.setUid(appUserAddress.getId().toString());
+ return R.ok(appUserAddress);
}
/**
--
Gitblit v1.7.1