From 069a8bfdac267391a9fd6b481da11d04ec0ee16f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 31 May 2020 14:42:49 +0800
Subject: [PATCH] modify regist interface
---
src/main/java/com/xcong/excoin/common/contants/AppContants.java | 3 +
src/main/java/com/xcong/excoin/modules/member/dao/MemberWalletContractSimulateDao.java | 10 +++
src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java | 6 +-
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 9 +++
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java | 55 ++++++++++++++++++
src/main/java/com/xcong/excoin/modules/member/entity/MemberWalletContractSimulateEntity.java | 34 +++++++++++
src/main/resources/mapper/member/MemberWalletContractSimulateDao.xml | 5 +
7 files changed, 118 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/common/contants/AppContants.java b/src/main/java/com/xcong/excoin/common/contants/AppContants.java
index 9bfbc23..3feb302 100644
--- a/src/main/java/com/xcong/excoin/common/contants/AppContants.java
+++ b/src/main/java/com/xcong/excoin/common/contants/AppContants.java
@@ -49,6 +49,9 @@
*/
public static final BigDecimal INIT_MONEY = BigDecimal.ZERO;
+
+ public static final Integer INIT_SIMULATE_MONEY = 5000;
+
/**
* homeSymbols 接口状态值 币币
*/
diff --git a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java
index 59d3b69..dc7f0c7 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java
@@ -4,12 +4,11 @@
import com.xcong.excoin.common.enumerates.SymbolEnum;
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.modules.contract.parameter.dto.SubmitEntrustDto;
+import com.xcong.excoin.modules.contract.parameter.vo.ContractEntrustVo;
import com.xcong.excoin.modules.contract.service.ContractEntrustOrderService;
import com.xcong.excoin.utils.TypeJudgeUtils;
import com.xcong.excoin.utils.api.response.Symbol;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -46,6 +45,7 @@
}
@ApiOperation(value = "获取当前委托单列表", notes = "获取当前委托单列表")
+ @ApiResponse(code = 0, message = "success", response = ContractEntrustVo.class)
@GetMapping(value = "/findCurrentEntrustOrderList")
public Result findCurrentEntrustOrderList() {
return contractEntrustOrderService.findEntrustOrderList();
diff --git a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
index 518bbcf..79a347c 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
@@ -1,7 +1,11 @@
package com.xcong.excoin.modules.contract.controller;
+import com.xcong.excoin.common.response.Result;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -10,8 +14,57 @@
* @date 2020-05-27
**/
@Slf4j
-@Api(value = "ContractOrderController", tags = "合约订单历史接口类")
+@Api(value = "ContractOrderController", tags = "合约订单接口类")
@RestController
@RequestMapping(value = "/api/contractOrder")
public class ContractOrderController {
+
+ @ApiOperation(value = "市价提交合约订单")
+ @PostMapping(value = "/submitOrder")
+ public Result submitOrder() {
+ return null;
+ }
+
+ @ApiOperation(value = "查询当前持仓订单列表")
+ @GetMapping(value = "/findHoldOrderList")
+ public Result findHoldOrderList() {
+ return null;
+ }
+
+ @ApiOperation(value = "根据Id查询订单详情")
+ @GetMapping(value = "/findOrderDetail")
+ public Result findOrderDetail() {
+ return null;
+ }
+
+ @ApiOperation(value = "根据Id平仓")
+ @GetMapping(value = "/closingOrder")
+ public Result closingOrder() {
+ return null;
+ }
+
+ @ApiOperation(value = "一键平仓")
+ @GetMapping(value = "/oneKeyClosing")
+ public Result oneKeyClosing() {
+ return null;
+ }
+
+ @ApiOperation(value = "设置止盈止损")
+ @PostMapping(value = "/setTargetProfitOrLoss")
+ public Result setTargetProfitOrLoss() {
+ return null;
+ }
+
+ @ApiOperation(value = "调整保证金")
+ @PostMapping(value = "/tuneUpBond")
+ public Result tuneUpBond() {
+ return null;
+ }
+
+ @ApiOperation(value = "分页查询历史订单列表")
+ @GetMapping(value = "/findHistoryOrderList")
+ public Result findHistoryOrderList() {
+ return null;
+ }
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/dao/MemberWalletContractSimulateDao.java b/src/main/java/com/xcong/excoin/modules/member/dao/MemberWalletContractSimulateDao.java
new file mode 100644
index 0000000..ca43023
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/dao/MemberWalletContractSimulateDao.java
@@ -0,0 +1,10 @@
+package com.xcong.excoin.modules.member.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xcong.excoin.modules.member.entity.MemberWalletContractSimulateEntity;
+
+/**
+ * @author helius
+ */
+public interface MemberWalletContractSimulateDao extends BaseMapper<MemberWalletContractSimulateEntity> {
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberWalletContractSimulateEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberWalletContractSimulateEntity.java
new file mode 100644
index 0000000..6554e6e
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberWalletContractSimulateEntity.java
@@ -0,0 +1,34 @@
+package com.xcong.excoin.modules.member.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xcong.excoin.common.system.base.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author wzy
+ * @date 2020-05-18
+ **/
+@Data
+@TableName("member_wallet_contract_simulate")
+public class MemberWalletContractSimulateEntity extends BaseEntity {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private Long memberId;
+
+ private BigDecimal availableBalance;
+
+ private BigDecimal totalBalance;
+
+ private BigDecimal frozenBalance;
+
+ private BigDecimal borrowedFund;
+
+ private String walletCode;
+
+ private String walletAddress;
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 360379d..1d746f9 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -44,6 +44,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -158,6 +159,14 @@
walletContract.setWalletCode(CoinTypeEnum.USDT.name());
memberWalletContractDao.insert(walletContract);
+ MemberWalletContractSimulateEntity walletContractSimulate = new MemberWalletContractSimulateEntity();
+ walletContractSimulate.setMemberId(member.getId());
+ walletContractSimulate.setAvailableBalance(new BigDecimal(AppContants.INIT_SIMULATE_MONEY));
+ walletContractSimulate.setTotalBalance(new BigDecimal(AppContants.INIT_SIMULATE_MONEY));
+ walletContractSimulate.setFrozenBalance(AppContants.INIT_MONEY);
+ walletContractSimulate.setBorrowedFund(AppContants.INIT_MONEY);
+ walletContractSimulate.setWalletCode(CoinTypeEnum.USDT.name());
+
// 初始化币币钱包
for (CoinTypeEnum coinTypeEnum : CoinTypeEnum.values()) {
diff --git a/src/main/resources/mapper/member/MemberWalletContractSimulateDao.xml b/src/main/resources/mapper/member/MemberWalletContractSimulateDao.xml
new file mode 100644
index 0000000..e54a1af
--- /dev/null
+++ b/src/main/resources/mapper/member/MemberWalletContractSimulateDao.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xcong.excoin.modules.member.dao.MemberWalletContractSimulateDao">
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1