From 7ee466ebc953bb5640bcf42f2b8e2a87aa471c21 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 15 四月 2026 20:12:21 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/web/src/main/java/com/doumee/api/web/AddrApi.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/AddrApi.java b/server/web/src/main/java/com/doumee/api/web/AddrApi.java
index 1d9315f..9a047fd 100644
--- a/server/web/src/main/java/com/doumee/api/web/AddrApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/AddrApi.java
@@ -33,10 +33,7 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
public ApiResponse<List<Addr>> list() {
- Addr query = new Addr();
- query.setMemberId(getMemberId());
- query.setDeleted(0);
- return ApiResponse.success("鏌ヨ鎴愬姛", addrService.findList(query));
+ return ApiResponse.success("鏌ヨ鎴愬姛", addrService.findListWithArea(getMemberId()));
}
@LoginRequired
@@ -46,7 +43,7 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
public ApiResponse<Addr> findById(@PathVariable Integer id) {
- return ApiResponse.success("鏌ヨ鎴愬姛", addrService.findById(id));
+ return ApiResponse.success("鏌ヨ鎴愬姛", addrService.findByIdWithArea(id));
}
@LoginRequired
@@ -56,9 +53,8 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
public ApiResponse create(@RequestBody Addr addr) {
- addr.setMemberId(getMemberId());
- addrService.create(addr);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
+ addrService.createByMember(addr, getMemberId());
+ return ApiResponse.success("鎿嶄綔鎴愬姛", addrService.findByIdWithArea(addr.getId()));
}
@LoginRequired
@@ -68,9 +64,8 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
public ApiResponse updateById(@RequestBody Addr addr) {
- addr.setMemberId(getMemberId());
- addrService.updateById(addr);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
+ addrService.updateByMember(addr, getMemberId());
+ return ApiResponse.success("鎿嶄綔鎴愬姛", addrService.findByIdWithArea(addr.getId()));
}
@LoginRequired
@@ -94,7 +89,7 @@
Addr addr = new Addr();
addr.setId(id);
addr.setIsDefault(1);
- addrService.updateById(addr);
+ addrService.updateByMember(addr, getMemberId());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.9.3