From 22603b2519b8dcb7f9a7c7d9ba636d9aba240a59 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 七月 2025 09:15:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/OrdersApi.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/OrdersApi.java b/server/web/src/main/java/com/doumee/api/web/OrdersApi.java
index 21be535..38571fa 100644
--- a/server/web/src/main/java/com/doumee/api/web/OrdersApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/OrdersApi.java
@@ -13,6 +13,7 @@
import com.doumee.dao.dto.ConfirmUpdOrderDTO;
import com.doumee.dao.dto.DoneOrderDTO;
import com.doumee.dao.dto.UpdOrderDataDTO;
+import com.doumee.dao.vo.OrderReleaseVO;
import com.doumee.service.business.IdentityInfoService;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.OrdersService;
@@ -31,7 +32,7 @@
* @Author : Rk
* @create 2025/7/10 9:29
*/
-@Api(tags = "1銆佽鍗曚笟鍔�")
+@Api(tags = "璁㈠崟涓氬姟")
@Trace(exclude = true)
@RestController
@RequestMapping("/web/orders")
@@ -51,7 +52,7 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
- public ApiResponse<Object> release(@RequestBody Orders orders) {
+ public ApiResponse<OrderReleaseVO> release(@RequestBody Orders orders) {
orders.setMember(this.getMemberResponse());
return ApiResponse.success("鎿嶄綔鎴愬姛",ordersService.create(orders));
}
@@ -167,6 +168,9 @@
@LoginRequired
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
public ApiResponse<PageData<Orders>> findPage (@RequestBody PageWrap<Orders> pageWrap) {
pageWrap.getModel().setMember(this.getMemberResponse());
return ApiResponse.success(ordersService.findPageForMini(pageWrap));
@@ -182,6 +186,15 @@
return ApiResponse.success("鎿嶄綔鎴愬姛",ordersService.getDetail(orderId,this.getMemberResponse().getUseIdentity()));
}
+ @LoginRequired
+ @ApiOperation("鑾峰彇棰勮閲戦锛堝垎锛�")
+ @PostMapping("/getTotal")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse<Long> getTotal(@RequestBody Orders orders) {
+ return ApiResponse.success(ordersService.getTotal(orders));
+ }
}
--
Gitblit v1.9.3