From 229e0ec1a577d604f15ed9659d7c2f0cd7edf8cd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 27 May 2021 15:00:12 +0800
Subject: [PATCH] Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc
---
src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java
index 96dae37..3065e30 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java
@@ -4,12 +4,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.modules.otc.dto.HasPayDto;
+import com.xcong.excoin.modules.otc.dto.OrderApealDto;
import com.xcong.excoin.modules.otc.dto.OrderListDto;
import com.xcong.excoin.modules.otc.dto.OtcOrderAddDto;
import com.xcong.excoin.modules.otc.service.OtcOrderService;
import com.xcong.excoin.modules.otc.vo.BuyOrderDetailVo;
import com.xcong.excoin.modules.otc.vo.OrderListVo;
import com.xcong.excoin.modules.otc.vo.SaleOrderDetailVo;
+import com.xcong.excoin.utils.RedisUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -85,8 +87,15 @@
}
@ApiOperation(value = "取消订单")
- @PostMapping(value = "/cancelOrder/{id}")
- public Result cancelOrder(Long id) {
- return null;
+ @PostMapping(value = "/cancelUserOrder/{id}")
+ public Result cancelUserOrder(@PathVariable("id") Long id) {
+ otcOrderService.cancelOrder(id);
+ return Result.ok("操作成功");
+ }
+
+ @ApiOperation(value = "申诉")
+ @PostMapping(value = "/orderApeal")
+ public Result orderApeal(@RequestBody OrderApealDto orderApealDto) {
+ return otcOrderService.orderApeal(orderApealDto);
}
}
--
Gitblit v1.9.1