From c611dbf70f2af43b69ece998622a503e1723197f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 05 Jun 2020 17:42:12 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java | 10 +++++++++-
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 1 +
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java b/src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java
index 2060785..9a82765 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java
@@ -1,5 +1,8 @@
package com.xcong.excoin.modules.contract.entity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.xcong.excoin.common.system.base.BaseEntity;
import lombok.Data;
@@ -31,6 +34,11 @@
* 订单状态 撤单
*/
public static final int ORDER_STATUS_CANCEL = 2;
+
+ /**
+ * 订单状态 成交
+ */
+ public static final int ORDER_STATUS_SUCCESS = 1;
/**
* 订单类型 开多
@@ -81,7 +89,7 @@
/**
* 订单状态 - 1成交 2撤单
*/
- private int orderStatus;
+ private int orderStatus = 1;
/**
* 委托开仓价
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
index 47684c4..f63eb5a 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
@@ -554,6 +554,7 @@
contractOrderEntity.setEntrustOpeningPrice(coinsCoinsOrder.getEntrustPrice());
contractOrderEntity.setEntrustTime(coinsCoinsOrder.getCreateTime());
contractOrderEntity.setOpeningTime(new Date());
+
contractOrderEntity.setId(null);
contractOrderService.save(contractOrderEntity);
// 发送爆仓的队列
--
Gitblit v1.9.1