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/OtcOrder.java | 96 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 96 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrder.java b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrder.java
new file mode 100644
index 0000000..dade3e0
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrder.java
@@ -0,0 +1,96 @@
+package com.xcong.excoin.modules.otc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xcong.excoin.common.system.base.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@TableName("otc_order")
+public class OtcOrder extends BaseEntity {
+
+ private Long memberId;
+
+ /**
+ * 订单编号
+ */
+ private String orderNo;
+
+ /**
+ * 单价
+ */
+ private BigDecimal unitPrice;
+
+ /**
+ * 数量
+ */
+ private BigDecimal coinAmount;
+
+ /**
+ * 总额
+ */
+ private BigDecimal totalAmount;
+
+ /**
+ * 订单状态 1-已提交未付款2-已付款3-已完成
+ */
+ private Integer status;
+ public static final Integer STATUS_SUBMIT = 1;
+ public static final Integer STATUS_PAY = 2;
+ public static final Integer STATUS_FINISH = 3;
+ public static final Integer STATUS_CANCEL = 4;
+
+ /**
+ * 付款时间
+ */
+ private Date payTime;
+
+ /**
+ * 完成时间
+ */
+ private Date finishTime;
+
+ /**
+ * 委托单ID
+ */
+ private Long entrustOrderId;
+
+ private Long mbId;
+
+ /**
+ * 支付市商ID
+ */
+ private Long payMbId;
+
+ /**
+ * 付款人姓名
+ */
+ private String payName;
+
+ /**
+ * 委托单用户ID
+ */
+ private Long entrustMemberId;
+
+ /**
+ * 订单类型 B-买 S-卖
+ */
+ private String orderType;
+
+ /**
+ * 对面的用户ID
+ */
+ private Long oppositeMemberId;
+
+ private String bankName;
+
+ private String bankNo;
+
+ private String cardName;
+
+ private String payType;
+
+ private Integer isReturn;
+}
--
Gitblit v1.9.1