From 864b77ebac060a40bb0a454e53fa851540a4cd19 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 29 May 2020 16:05:22 +0800
Subject: [PATCH] 20200529 代码提交
---
src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java b/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java
index 62de78e..006490e 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java
@@ -15,10 +15,11 @@
import com.xcong.excoin.modules.coin.parameter.dto.CancelEntrustWalletCoinOrderDto;
import com.xcong.excoin.modules.coin.parameter.dto.FindCollectDto;
import com.xcong.excoin.modules.coin.parameter.dto.SubmitSalesWalletCoinOrderDto;
+import com.xcong.excoin.modules.coin.parameter.vo.FindCollectListVo;
import com.xcong.excoin.modules.coin.parameter.vo.MemberSelectSymbolsVo;
import com.xcong.excoin.modules.coin.parameter.vo.OrderWalletCoinDealListVo;
import com.xcong.excoin.modules.coin.parameter.vo.OrderWalletCoinDealVo;
-import com.xcong.excoin.modules.coin.parameter.vo.OrderWalletCoinVo;
+import com.xcong.excoin.modules.coin.parameter.vo.OrderWalletCoinListVo;
import com.xcong.excoin.modules.coin.parameter.vo.TransactionPageOfWalletCoinVo;
import com.xcong.excoin.modules.coin.service.OrderCoinService;
@@ -75,10 +76,10 @@
* @return
*/
@ApiOperation(value = "获取委托单数据", notes = "获取委托单数据")
- @ApiResponses({@ApiResponse( code = 200, message = "success", response = OrderWalletCoinVo.class)})
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = OrderWalletCoinListVo.class)})
@ApiImplicitParams({
@ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query"),
- @ApiImplicitParam(name = "status", value = "状态 1：委托中2：撤单3：已成交", required = true, dataType = "Integer", paramType="query")
+ @ApiImplicitParam(name = "status", value = "状态 1：委托中2：撤单3：已成交", required = true, dataType = "int", paramType="query")
})
@GetMapping(value = "/getEntrustWalletCoinOrder")
public Result getEntrustWalletCoinOrder(String symbol,Integer status) {
@@ -92,8 +93,8 @@
@ApiOperation(value = "撤销委托订单", notes = "撤销委托订单")
@PostMapping(value="/cancelEntrustWalletCoinOrder")
public Result cancelEntrustWalletCoinOrder(@RequestBody @Valid CancelEntrustWalletCoinOrderDto cancelEntrustWalletCoinOrderDto) {
- String orderNo = cancelEntrustWalletCoinOrderDto.getOrderNo();
- return orderCoinService.cancelEntrustWalletCoinOrder(orderNo);
+ String orderId = cancelEntrustWalletCoinOrderDto.getOrderId();
+ return orderCoinService.cancelEntrustWalletCoinOrder(orderId);
}
/**
@@ -147,4 +148,15 @@
return orderCoinService.checkIsCollect(symbol);
}
+ /**
+ * 已自选的币种
+ * @return
+ */
+ @ApiOperation(value = "已自选的币种", notes = "已自选的币种")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = FindCollectListVo.class)})
+ @GetMapping(value = "/findCollectList")
+ public Result findCollectList() {
+ return orderCoinService.findCollectList();
+ }
+
}
--
Gitblit v1.9.1