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/OtcMarketBussiness.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/entity/OtcMarketBussiness.java b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcMarketBussiness.java
new file mode 100644
index 0000000..2ad3ae4
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcMarketBussiness.java
@@ -0,0 +1,60 @@
+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;
+
+@Data
+@TableName("otc_market_bussiness")
+public class OtcMarketBussiness extends BaseEntity {
+
+ private Long memberId;
+
+ private String nikename;
+
+ private String declaration;
+
+ /**
+ * 1-待审核2-审核通过3-审核拒绝
+ */
+ private Integer status;
+ public static final Integer CHECK_WAIT = 1;
+ public static final Integer CHECK_PASS = 2;
+ public static final Integer CHECK_REFUSE = 3;
+
+ private Integer buyCnt;
+
+ private Integer totalOrderCnt;
+
+ private BigDecimal finishRatio;
+
+ private Integer avgPayTime;
+
+ private Integer avgCoinTime;
+
+ /**
+ * 待回款
+ */
+ private BigDecimal waitBackMoney;
+
+ /**
+ * 已回款
+ */
+ private BigDecimal hasBackMoney;
+
+ /**
+ * 卖单数
+ */
+ private Integer saleOrderCnt;
+
+ private BigDecimal saleFinishRatio;
+
+ /**
+ * 买单数
+ */
+ private Integer buyOrderCnt;
+
+ private Integer saleTotalCnt;
+}
--
Gitblit v1.9.1