From 6c2e9ba62c418185361179e7014862c481f34e17 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 09 Mar 2022 14:22:09 +0800
Subject: [PATCH] conflect merge
---
src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrder.java | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 79 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrder.java b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrder.java
new file mode 100644
index 0000000..fb0c390
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrder.java
@@ -0,0 +1,79 @@
+package com.xcong.excoin.modules.otc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xcong.excoin.common.system.base.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@TableName("otc_entrust_order")
+public class OtcEntrustOrder extends BaseEntity {
+
+ private Long memberId;
+
+ private Long mbId;
+
+ /**
+ * 委托单号
+ */
+ private String entrustOrderNo;
+
+ /**
+ * 单价
+ */
+ private BigDecimal unitPrice;
+
+ /**
+ * 数量
+ */
+ private BigDecimal coinAmount;
+
+ /**
+ * 剩余数量
+ */
+ private BigDecimal remainCoinAmount;
+
+ /**
+ * 限额
+ */
+ private BigDecimal limitMinAmount;
+
+ /**
+ * 限额
+ */
+ private BigDecimal limitMaxAmount;
+
+ /**
+ * 委托总金额
+ */
+ private BigDecimal totalAmount;
+
+ /**
+ * 委托单类型 B-买 S-卖
+ */
+ private String orderType;
+ public static final String ORDER_TYPE_B = "B";
+ public static final String ORDER_TYPE_S = "S";
+
+ /**
+ * 1-上线 2-下线 3-撤销
+ */
+ private Integer status;
+ public static final Integer LINE_UP = 1;
+ public static final Integer LINE_DOWN = 2;
+ public static final Integer LINE_CANCEL = 3;
+
+ /**
+ * 是否市商 1-是 2-否
+ */
+ private Integer isMb;
+ public static final Integer IS_MB_Y = 1;
+ public static final Integer IS_MB_N = 2;
+
+ @TableField(exist = false)
+ private String payType;
+ @TableField(exist = false)
+ private Integer isDefualt;
+}
--
Gitblit v1.9.1