From 82735e4d46ac7b9969facef2acc8f8e793b68f71 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 15 九月 2025 16:11:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/OrdersApi.java | 73 +++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 26 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 38571fa..4262967 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
@@ -9,10 +9,7 @@
import com.doumee.dao.business.model.IdentityInfo;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Orders;
-import com.doumee.dao.dto.CommentDTO;
-import com.doumee.dao.dto.ConfirmUpdOrderDTO;
-import com.doumee.dao.dto.DoneOrderDTO;
-import com.doumee.dao.dto.UpdOrderDataDTO;
+import com.doumee.dao.dto.*;
import com.doumee.dao.vo.OrderReleaseVO;
import com.doumee.service.business.IdentityInfoService;
import com.doumee.service.business.MemberService;
@@ -65,9 +62,34 @@
})
public ApiResponse updateOrder(@RequestBody Orders orders) {
orders.setMember(this.getMemberResponse());
- ordersService.updateById(orders);
+ ordersService.update(orders);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+
+ @LoginRequired
+ @ApiOperation(value = "鎺ュ崟鏂圭‘璁よ鍗曡垂鐢� - 鎺ュ崟鏂�", notes = "灏忕▼搴忕")
+ @PostMapping("/confirmFee")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse confirmFee(@RequestBody ConfirmFeeOrderDTO orders) {
+ orders.setMember(this.getMemberResponse());
+ ordersService.confirmFee(orders);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+// @LoginRequired
+// @ApiOperation(value = "淇敼璁㈠崟鏃ユ湡 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
+// @PostMapping("/updOrderData")
+// @ApiImplicitParams({
+// @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+// })
+// public ApiResponse updOrderData(@RequestBody UpdOrderDataDTO updOrderDataDTO) {
+// updOrderDataDTO.setMember(this.getMemberResponse());
+// ordersService.updOrderData(updOrderDataDTO);
+// return ApiResponse.success("鎿嶄綔鎴愬姛");
+// }
@LoginRequired
@ApiOperation(value = "鎵嬪姩鎺ュ崟 - 鎺ュ崟鏂�", notes = "灏忕▼搴忕")
@@ -93,39 +115,27 @@
@LoginRequired
@ApiOperation(value = "鍙栨秷璁㈠崟 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
- @GetMapping("/releaseCancelOrder")
+ @GetMapping("/cancelOrder")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
- public ApiResponse releaseCancelOrder(@RequestParam Integer orderId) {
- ordersService.releaseCancelOrder(orderId,this.getMemberResponse());
+ public ApiResponse cancelOrder(@RequestParam Integer orderId) {
+ ordersService.cancelOrder(orderId,this.getMemberResponse());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
-
@LoginRequired
- @ApiOperation(value = "鍙栨秷鎺ュ崟 - 鎺ュ崟鏂�", notes = "灏忕▼搴忕")
- @GetMapping("/receiveCancelOrder")
+ @ApiOperation(value = "鍙栨秷鍓嶆彁绀鸿 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
+ @GetMapping("/cancelTips")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
- public ApiResponse receiveCancelOrder(@RequestParam Integer orderId) {
- ordersService.receiveCancelOrder(orderId,this.getMemberResponse());
+ public ApiResponse cancelTips(@RequestParam Integer orderId) {
+ ordersService.cancelTips(orderId,this.getMemberResponse());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
- @LoginRequired
- @ApiOperation(value = "淇敼璁㈠崟鏃ユ湡 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
- @PostMapping("/updOrderData")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse updOrderData(@RequestBody UpdOrderDataDTO updOrderDataDTO) {
- updOrderDataDTO.setMember(this.getMemberResponse());
- ordersService.updOrderData(updOrderDataDTO);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
@LoginRequired
@ApiOperation(value = "纭璁㈠崟淇敼 - 鎺ュ崟鏂�", notes = "灏忕▼搴忕")
@@ -145,9 +155,20 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
- public ApiResponse<Object> doneOrder(@RequestBody DoneOrderDTO doneOrderDTO) {
+ public ApiResponse<OrderReleaseVO> doneOrder(@RequestBody DoneOrderDTO doneOrderDTO) {
doneOrderDTO.setMember(getMemberResponse());
return ApiResponse.success("鎿嶄綔鎴愬姛",ordersService.doneOrder(doneOrderDTO));
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "璁㈠崟閲嶆柊鏀粯 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
+ @PostMapping("/reusePay")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse<OrderReleaseVO> reusePay(@RequestBody ReusePayDTO reusePayDTO) {
+ reusePayDTO.setMember(getMemberResponse());
+ return ApiResponse.success("鎿嶄綔鎴愬姛",ordersService.reusePay(reusePayDTO));
}
@@ -183,7 +204,7 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
public ApiResponse<Orders> getDetail(@RequestParam Integer orderId) {
- return ApiResponse.success("鎿嶄綔鎴愬姛",ordersService.getDetail(orderId,this.getMemberResponse().getUseIdentity()));
+ return ApiResponse.success("鎿嶄綔鎴愬姛",ordersService.getDetail(orderId,this.getMemberResponse()));
}
@LoginRequired
--
Gitblit v1.9.3