From 9923d2fee1010fe3e0dd7167c38107da16a7b2f2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 七月 2025 19:18:29 +0800
Subject: [PATCH] 111
---
server/web/src/main/java/com/doumee/api/web/OrdersApi.java | 72 ++++++++++++++++++++++++++++++++---
1 files changed, 65 insertions(+), 7 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 36c03d3..fe942c1 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
@@ -4,12 +4,13 @@
import com.doumee.core.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
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.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;
import com.doumee.service.business.OrdersService;
@@ -18,6 +19,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -27,7 +29,7 @@
* @Author : Rk
* @create 2025/7/10 9:29
*/
-@Api(tags = "1銆佽鍗曚笟鍔�")
+@Api(tags = "璁㈠崟涓氬姟")
@Trace(exclude = true)
@RestController
@RequestMapping("/web/orders")
@@ -47,7 +49,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));
}
@@ -136,15 +138,71 @@
@LoginRequired
@ApiOperation(value = "瀹屾垚璁㈠崟 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
- @GetMapping("/doneOrder")
+ @PostMapping("/doneOrder")
@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));
+ }
+
+
+ @LoginRequired
+ @ApiOperation(value = "璁㈠崟璇勪环 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
+ @PostMapping("/comment")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse comment(@RequestBody CommentDTO commentDTO) {
+ commentDTO.setMember(this.getMemberResponse());
+ ordersService.comment(commentDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+
+ @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));
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "璁㈠崟璇︽儏", notes = "灏忕▼搴忕")
+ @GetMapping("/getDetail")
+ @ApiImplicitParams({
+ @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()));
+ }
+
+ @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