From f5d87a5a585adcbb148dee6c62ff6e18c4e7334c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 May 2021 14:36:40 +0800
Subject: [PATCH] conflect
---
src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 40618bd..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,9 +87,15 @@
}
@ApiOperation(value = "取消订单")
- @PostMapping(value = "/cancelOrder/{id}")
- public Result cancelOrder(Long id) {
+ @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