From 74b0e0814e37d640596f44ec86d20fa9ecce9ed6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 10:42:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java | 82 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 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 6b4046f..0ddf5fa 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>
@@ -35,6 +36,17 @@
}
/**
+ * 远程调用 通过地址id 查询地址信息
+ * @param id
+ * @return
+ */
+ @GetMapping(value = "/getAddressById/{id}")
+ public R<TAppUserAddress> getAddressById(@PathVariable("id") Long id) {
+ TAppUserAddress byId = appUserAddressService.getById(id);
+
+ return R.ok(byId);
+ }
+ /**
* 查询用户地址列表
*/
@ApiOperation(tags = {"小程序-用户地址"},value = "查询用户地址列表")
@@ -42,7 +54,26 @@
public AjaxResult<List<TAppUserAddress>> queryAddress() {
// 用户id
Long userId = tokenService.getLoginUserApplet().getUserId();
- return AjaxResult.ok(appUserAddressService.list(Wrappers.<TAppUserAddress>lambdaQuery().eq(TAppUserAddress::getAppUserId, userId)));
+ List<TAppUserAddress> list = appUserAddressService.list(Wrappers.<TAppUserAddress>lambdaQuery().eq(TAppUserAddress::getAppUserId, userId));
+ list.forEach(e->e.setUid(e.getId().toString()));
+ return AjaxResult.ok(list);
+ }
+
+ /**
+ * 查询用户默认地址列表
+ */
+ @ApiOperation(tags = {"小程序-用户地址"},value = "查询用户默认地址")
+ @GetMapping(value = "/queryDefaultAddress")
+ public AjaxResult<TAppUserAddress> queryDefaultAddress() {
+ // 用户id
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ 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);
}
@@ -62,12 +93,54 @@
/**
* 修改用户地址
*/
+ @ApiOperation(tags = {"小程序-用户地址"},value = "设置默认地址")
+ @GetMapping(value = "/setDefaultAddress")
+ public AjaxResult<String> setDefaultAddress(@RequestParam(value = "id") Long id) {
+ TAppUserAddress appUserAddress = appUserAddressService.getById(id);
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ if(!appUserAddress.getAppUserId().equals(userId)){
+ return AjaxResult.error("权限不足");
+ }
+ // 修改用户默认地址
+ appUserAddressService.updateDefaultAddress(1,tokenService.getLoginUserApplet().getUserId());
+ appUserAddress.setDefaultAddress(1);
+ appUserAddressService.updateById(appUserAddress);
+ return AjaxResult.success();
+ }
+
+ /**
+ * 修改用户地址
+ */
@ApiOperation(tags = {"小程序-用户地址"},value = "修改用户地址")
@PostMapping(value = "/update")
public AjaxResult<Boolean> update(@RequestBody TAppUserAddress dto) {
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ TAppUserAddress userAddress = appUserAddressService.getById(dto.getId());
+ if(!userAddress.getAppUserId().equals(userId)){
+ return AjaxResult.error("权限不足");
+ }
+ // 用户id
+ dto.setAppUserId(userId);
// 修改用户默认地址
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 appUserAddress = appUserAddressService.getById(id);
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ if(!appUserAddress.getAppUserId().equals(userId)){
+ return R.fail("权限不足");
+ }
+ appUserAddress.setUid(appUserAddress.getId().toString());
+ return R.ok(appUserAddress);
}
/**
@@ -75,7 +148,12 @@
*/
@ApiOperation(tags = {"小程序-用户地址"},value = "删除用户地址")
@DeleteMapping(value = "/deleteById")
- public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
+ public AjaxResult<Boolean> deleteById(@RequestParam("id") Long id) {
+ TAppUserAddress appUserAddress = appUserAddressService.getById(id);
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ if(!appUserAddress.getAppUserId().equals(userId)){
+ return AjaxResult.error("权限不足");
+ }
return AjaxResult.ok(appUserAddressService.removeById(id));
}
--
Gitblit v1.7.1