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 | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 175 insertions(+), 5 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 dac3322..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
@@ -1,10 +1,16 @@
package com.doumee.api.web;
+import com.azure.core.annotation.Post;
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.*;
+import com.doumee.dao.vo.OrderReleaseVO;
import com.doumee.service.business.IdentityInfoService;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.OrdersService;
@@ -13,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.*;
@@ -22,7 +29,7 @@
* @Author : Rk
* @create 2025/7/10 9:29
*/
-@Api(tags = "1銆佽鍗曚笟鍔�")
+@Api(tags = "璁㈠崟涓氬姟")
@Trace(exclude = true)
@RestController
@RequestMapping("/web/orders")
@@ -37,15 +44,178 @@
private OrdersService ordersService;
@LoginRequired
- @ApiOperation(value = "缂栬緫涓汉淇℃伅", notes = "灏忕▼搴忕")
- @GetMapping("/getMemberInfo")
+ @ApiOperation(value = "鍙戝竷璁㈠崟 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
+ @PostMapping("/release")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
- public ApiResponse<Member> getMemberInfo() {
- return ApiResponse.success("鏌ヨ鎴愬姛",memberService.getMemberInfo(getMemberId()));
+ public ApiResponse<OrderReleaseVO> release(@RequestBody Orders orders) {
+ orders.setMember(this.getMemberResponse());
+ return ApiResponse.success("鎿嶄綔鎴愬姛",ordersService.create(orders));
}
+ @LoginRequired
+ @ApiOperation(value = "淇敼璁㈠崟 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
+ @PostMapping("/updateOrder")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse updateOrder(@RequestBody Orders orders) {
+ orders.setMember(this.getMemberResponse());
+ 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 = "灏忕▼搴忕")
+ @GetMapping("/accept")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse accept(@RequestParam Integer orderId) {
+ ordersService.accept(orderId,this.getMemberResponse());
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "寮�濮嬩綔涓� - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
+ @GetMapping("/begin")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse begin(@RequestParam Integer orderId) {
+ ordersService.begin(orderId,this.getMemberResponse());
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "鍙栨秷璁㈠崟 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
+ @GetMapping("/cancelOrder")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse cancelOrder(@RequestParam Integer orderId) {
+ ordersService.cancelOrder(orderId,this.getMemberResponse());
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "鍙栨秷鍓嶆彁绀鸿 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
+ @GetMapping("/cancelTips")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse cancelTips(@RequestParam Integer orderId) {
+ ordersService.cancelTips(orderId,this.getMemberResponse());
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+
+ @LoginRequired
+ @ApiOperation(value = "纭璁㈠崟淇敼 - 鎺ュ崟鏂�", notes = "灏忕▼搴忕")
+ @PostMapping("/confirmUpd")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse confirmUpd(@RequestBody ConfirmUpdOrderDTO confirmUpdOrderDTO) {
+ confirmUpdOrderDTO.setMember(this.getMemberResponse());
+ ordersService.confirmUpd(confirmUpdOrderDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "瀹屾垚璁㈠崟 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
+ @PostMapping("/doneOrder")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ 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()));
+ }
+
+ @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