From d8786c8c3b5084bdad9ef318d056d81579e622f0 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 30 九月 2024 11:11:04 +0800
Subject: [PATCH] 合并
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 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 cf9948c..741100d 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
@@ -12,6 +12,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -66,8 +67,13 @@
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));
+ if(Objects.isNull(appUserAddress)){
+ return AjaxResult.success();
+ }
+ appUserAddress.setUid(appUserAddress.getId().toString());
+ return AjaxResult.success(appUserAddress);
}
@@ -104,9 +110,24 @@
@ApiOperation(tags = {"小程序-用户地址"},value = "修改用户地址")
@PostMapping(value = "/update")
public AjaxResult<Boolean> update(@RequestBody TAppUserAddress dto) {
+ // 用户id
+ dto.setAppUserId(tokenService.getLoginUserApplet().getUserId());
// 修改用户默认地址
appUserAddressService.updateDefaultAddress(dto.getDefaultAddress(),dto.getAppUserId());
return AjaxResult.ok(appUserAddressService.updateById(dto));
+ }
+
+ /**
+ * 通过地址id 查询地址信息
+ * @param id
+ * @return
+ */
+ @ApiOperation(tags = {"小程序-用户地址"},value = "查询用户地址详情")
+ @GetMapping(value = "/getDetailById")
+ public R<TAppUserAddress> getDetailById(@RequestParam(value = "id")Long id) {
+ TAppUserAddress byId = appUserAddressService.getById(id);
+ byId.setUid(byId.getId().toString());
+ return R.ok(byId);
}
/**
@@ -114,7 +135,7 @@
*/
@ApiOperation(tags = {"小程序-用户地址"},value = "删除用户地址")
@DeleteMapping(value = "/deleteById")
- public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
+ public AjaxResult<Boolean> deleteById(@RequestParam("id") Long id) {
return AjaxResult.ok(appUserAddressService.removeById(id));
}
--
Gitblit v1.7.1