From 3b05807a5e6f578b981282cc18047e6bbe7f3a32 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 26 May 2020 16:22:32 +0800
Subject: [PATCH] 20200526 代码提交
---
src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java | 98 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 92 insertions(+), 6 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 b5b0b20..e0b3804 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
@@ -12,13 +12,23 @@
import org.springframework.web.bind.annotation.RestController;
import com.xcong.excoin.common.response.Result;
+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.dto.TransferOfBalanceDto;
+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.TransactionPageOfWalletCoinVo;
import com.xcong.excoin.modules.coin.service.OrderCoinService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@@ -35,16 +45,18 @@
* @return
*/
@ApiOperation(value = "进入交易页面", notes = "进入交易页面")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = TransactionPageOfWalletCoinVo.class)})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query"),
+ @ApiImplicitParam(name = "type", value = "买入卖出类型1：买入，2：卖出", required = true, dataType = "String", paramType="query")
+ })
@GetMapping(value = "/enterTransactionPageOfWalletCoin")
- public Result enterTransactionPageOfWalletCoin( @ApiParam(name="symbol",value="币种",required=true)String symbol,
- @ApiParam(name="type",value="买入卖出类型",required=true)String type) {
+ public Result enterTransactionPageOfWalletCoin(String symbol,String type) {
return orderCoinService.enterTransactionPageOfWalletCoin(symbol,type);
}
/**
* 提交买卖订单
- * @param buySymbolTradeVo
- * @param token
* @return
*/
@ApiOperation(value = "提交买卖订单", notes = "提交买卖订单")
@@ -57,5 +69,79 @@
BigDecimal amount = submitSalesWalletCoinOrderDto.getAmount();
return orderCoinService.submitSalesWalletCoinOrder(symbol,type,tradeType,price,amount);
}
-
+
+ /**
+ * 获取委托单数据
+ * @return
+ */
+ @ApiOperation(value = "获取委托单数据", notes = "获取委托单数据")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = OrderWalletCoinVo.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")
+ })
+ @GetMapping(value = "/getEntrustWalletCoinOrder")
+ public Result getEntrustWalletCoinOrder(String symbol,Integer status) {
+ return orderCoinService.getEntrustWalletCoinOrder(symbol,status);
+ }
+
+ /**
+ * 撤销委托订单
+ * @return
+ */
+ @ApiOperation(value = "撤销委托订单", notes = "撤销委托订单")
+ @PostMapping(value="/cancelEntrustWalletCoinOrder")
+ public Result cancelEntrustWalletCoinOrder(@RequestBody @Valid CancelEntrustWalletCoinOrderDto cancelEntrustWalletCoinOrderDto) {
+ String orderNo = cancelEntrustWalletCoinOrderDto.getOrderNo();
+ return orderCoinService.cancelEntrustWalletCoinOrder(orderNo);
+ }
+
+ /**
+ * 获取币币交易历史订单信息
+ * @return
+ */
+ @ApiOperation(value = "获取币币交易历史订单信息", notes = "获取币币交易历史订单信息")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = OrderWalletCoinDealListVo.class)})
+ @GetMapping(value = "/findAllWalletCoinOrder")
+ public Result findAllWalletCoinOrder() {
+ return orderCoinService.findAllWalletCoinOrder();
+ }
+
+ /**
+ * 获取一条币币交易历史订单信息
+ * @return
+ */
+ @ApiOperation(value = "获取一条币币交易历史订单信息", notes = "获取一条币币交易历史订单信息")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = OrderWalletCoinDealVo.class)})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "orderId", value = "订单ID", required = true, dataType = "Long", paramType="query")
+ })
+ @GetMapping(value = "/findWalletCoinOrder")
+ public Result findWalletCoinOrder(Long orderId) {
+ return orderCoinService.findWalletCoinOrder(orderId);
+ }
+
+ /**
+ * 币币自选|取消自选
+ * @return
+ */
+ @ApiOperation(value = "币币自选|取消自选", notes = "币币自选|取消自选")
+ @PostMapping(value="/findCollect")
+ public Result findCollect(@RequestBody @Valid FindCollectDto findCollectDto) {
+ String symbol = findCollectDto.getSymbol();
+ Integer type = findCollectDto.getType();
+ return orderCoinService.findCollect(symbol,type);
+ }
+
+ /**
+ * 币币是否自选
+ * @return
+ */
+ @ApiOperation(value = "币币是否自选", notes = "币币是否自选")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberSelectSymbolsVo.class)})
+ @PostMapping(value="/checkIsCollect")
+ public Result checkIsCollect(@ApiParam(name="symbol",value="币种",required=true)String symbol) {
+ return orderCoinService.checkIsCollect(symbol);
+ }
+
}
--
Gitblit v1.9.1