From bc60c2e83e277421336c0583c6105d9da9308c4b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 10 Aug 2020 14:58:23 +0800
Subject: [PATCH] add whole some code

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java |    7 +++++++
 src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java  |    6 ++++++
 src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java                     |    2 +-
 src/main/java/com/xcong/excoin/modules/contract/parameter/dto/WholeCloseOrderDto.java    |   25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 1 deletions(-)

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 1ce9e3d..5edbdec 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
@@ -115,4 +115,10 @@
         return contractHoldOrderService.findOrderDetailById(id);
     }
 
+    @ApiOperation(value = "全仓模式平仓")
+    @PostMapping(value = "/closingOrder")
+    public Result closingOrder(@RequestBody @Validated WholeCloseOrderDto wholeCloseOrderDto) {
+        return null;
+    }
+
 }
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/dto/WholeCloseOrderDto.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/dto/WholeCloseOrderDto.java
new file mode 100644
index 0000000..983759f
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/dto/WholeCloseOrderDto.java
@@ -0,0 +1,25 @@
+package com.xcong.excoin.modules.contract.parameter.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author wzy
+ * @date 2020-08-10
+ **/
+@Data
+@ApiModel(value = "WholeCloseOrderDto", description = "全仓模式平仓接受参数类")
+public class WholeCloseOrderDto {
+
+    @NotNull
+    @ApiModelProperty(value = "订单ID", example = "1")
+    private Long id;
+
+    @Min(1)
+    @ApiModelProperty(value = "平仓张数", example = "1")
+    private int count;
+}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
index 122b682..d100e8c 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
@@ -234,4 +234,11 @@
         profitDetailEntity.setOrderNo(orderNo);
         followTraderProfitDetailDao.insert(profitDetailEntity);
     }
+
+    /**
+     * 全仓模式平仓逻辑
+     */
+    public void closingWholeOrder(ContractHoldOrderEntity contractHoldOrderEntity) {
+
+    }
 }
diff --git a/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java b/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
index c396ee9..2201eff 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
@@ -41,7 +41,7 @@
     @Resource
     private FollowTraderProfitInfoDao followTraderProfitInfoDao;
 
-    @Scheduled(cron = "0 0/30 * * * ? ")
+//    @Scheduled(cron = "0 0/30 * * * ? ")
     public void traderProfitUpdate() {
         log.info("交易员定时任务执行");
         // 查询所有交易员信息

--
Gitblit v1.9.1