From cf200a1f92c01ba22c326c49391f748ffb006910 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Jul 2021 17:28:35 +0800
Subject: [PATCH] 20210617  开售开关

---
 src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java |  390 +++++++++++++++++++++++++++++++------------------------
 1 files changed, 222 insertions(+), 168 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
index 0c42786..5a28f7d 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
@@ -1,168 +1,222 @@
-package com.xcong.excoin.modules.member.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xcong.excoin.common.entity.BaseEntity;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 会员信息实体
- *
- * @author wzy
- * @date 2020-05-12
- **/
-@Data
-@TableName("member")
-public class MemberEntity extends BaseEntity {
-
-    /**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-     * 账号状态 - 禁用
-     */
-    public static final Integer ACCOUNT_STATUS_DISABLED = 0;
-
-    /**
-     * 账号状态 - 启用
-     */
-    public static final Integer ACCOUNT_STATUS_ENABLE = 1;
-
-    /**
-     * 账号代理级别
-     */
-    public static final Integer ACCOUNT_AGENT_LEVEL = 6;
-
-    /**
-     * 账号类型 手机
-     */
-    public static final Integer ACCOUNT_TYPE_PHONE = 1;
-
-    /**
-     * 账号类型 邮箱
-     */
-    public static final Integer ACCOUNT_TYPE_EMAIL = 2;
-
-    /**
-     * 实名认证 审核通过
-     */
-    public static final Integer CERTIFY_STATUS_Y = 2;
-    /**
-     * 实名认证 审核不通过
-     */
-    public static final Integer CERTIFY_STATUS_N = 0;
-    /**
-     * 实名认证 审核中
-     */
-    public static final Integer CERTIFY_STATUS_ING = 1;
-    /**
-     * 实名认证 未提交
-     */
-    public static final Integer CERTIFY_STATUS_UN_SUBMIT = 3;
-
-    public static final int IS_PROFIT_Y = 1;
-
-    public static final int IS_PROFIT_N = 0;
-
-    /**
-     * 手机号(包含国际手机号)
-     */
-    private String phone;
-
-    /**
-     * 邮箱
-     */
-    private String email;
-
-    /**
-     * 登陆密码
-     */
-    private String password;
-
-    /**
-     * 交易密码
-     */
-    private String tradePassword;
-
-    /**
-     * 交易密码时效性设置
-     */
-    private Integer tradeAgingSetting;
-
-    /**
-     * 邀请码
-     */
-    private String inviteId;
-
-    /**
-     * 账号状态 0-禁用 1-启用
-     */
-    private Integer accountStatus;
-
-    /**
-     * 上级推荐人id
-     */
-    private String refererId;
-
-    /**
-     * 上级推荐人ID链
-     */
-    private String refererIds;
-
-    /**
-     * 账号类型 1-正常账号 2-测试账号
-     */
-    private Integer accountType;
-
-    /**
-     * 代理级别
-     */
-    private Integer agentLevel;
-
-    /**
-     * 实名认证状态 0-审核未通过 1-审核通过 2-等待审核
-     */
-    private Integer certifyStatus;
-
-    /**
-     * 身份证号
-     */
-    private String idcardNo;
-
-    /**
-     * 是否设置盈亏难度系数 0-否1-是
-     */
-    private Integer isProfit;
-
-    /**
-     * 是否设置预估强平价系数 0-否1-是
-     */
-    private Integer isForce;
-    @TableField(exist = false)
-    private String account;
-    @TableField(exist = false)
-    private String firstName;
-    
-    @TableField(exist = false)
-    private String secondName;
-    
-    @TableField(exist = false)
-    private String realName;
-    
-    @TableField(exist = false)
-    private BigDecimal coinNumber;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(exist = false)
-    private Date startTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(exist = false)
-    private Date endTime;
-}
+package com.xcong.excoin.modules.member.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xcong.excoin.common.entity.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 会员信息实体
+ *
+ * @author wzy
+ * @date 2020-05-12
+ **/
+@Data
+@TableName("member")
+public class MemberEntity extends BaseEntity {
+
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 系统推荐人id
+     */
+    public static final String SYSTEM_REFERER = "rxadr3";
+
+	/**
+     * 账号状态 - 禁用
+     */
+    public static final Integer ACCOUNT_STATUS_DISABLED = 0;
+
+    /**
+     * 账号状态 - 启用
+     */
+    public static final Integer ACCOUNT_STATUS_ENABLE = 1;
+
+    /**
+     * 账号代理级别
+     */
+    public static final Integer ACCOUNT_AGENT_LEVEL = 6;
+
+    /**
+     * 账号类型 手机
+     */
+    public static final Integer ACCOUNT_TYPE_PHONE = 1;
+
+    /**
+     * 账号类型 邮箱
+     */
+    public static final Integer ACCOUNT_TYPE_EMAIL = 2;
+
+    /**
+     * 实名认证 审核通过
+     */
+    public static final Integer CERTIFY_STATUS_Y = 2;
+    /**
+     * 实名认证 审核不通过
+     */
+    public static final Integer CERTIFY_STATUS_N = 0;
+    /**
+     * 实名认证 审核中
+     */
+    public static final Integer CERTIFY_STATUS_ING = 1;
+    /**
+     * 实名认证 未提交
+     */
+    public static final Integer CERTIFY_STATUS_UN_SUBMIT = 3;
+
+    public static final int IS_PROFIT_Y = 1;
+
+    public static final int IS_PROFIT_N = 0;
+
+    /**
+     * 手机号(包含国际手机号)
+     */
+    private String phone;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 登陆密码
+     */
+    private String password;
+
+    /**
+     * 交易密码
+     */
+    private String tradePassword;
+
+    /**
+     * 交易密码时效性设置
+     */
+    private Integer tradeAgingSetting;
+
+    /**
+     * 邀请码
+     */
+    private String inviteId;
+
+    /**
+     * 账号状态 0-禁用 1-启用
+     */
+    private Integer accountStatus;
+
+    /**
+     * 上级推荐人id
+     */
+    private String refererId;
+
+    /**
+     * 上级推荐人ID链
+     */
+    private String refererIds;
+
+    /**
+     * 账号类型 1-正常账号 2-测试账号
+     */
+    private Integer accountType;
+
+    /**
+     * 代理级别
+     */
+    private Integer agentLevel;
+
+    /**
+     * 实名认证状态 0-审核未通过 1-审核通过 2-等待审核
+     */
+    private Integer certifyStatus;
+
+    /**
+     * 身份证号
+     */
+    private String idcardNo;
+
+    /**
+     * 是否设置盈亏难度系数 0-否1-是
+     */
+    private Integer isProfit;
+    
+    /**
+     * 是否是商户1是2否
+     */
+    private Integer isTrader;
+    public static final int ISTRADER_Y = 1;
+    public static final int ISTRADER_N = 2;
+    
+    /**
+     * 是否可平仓   1:否   0:是
+     */
+    private Integer pcState;
+    public static final int PCSTATE_Y = 0;
+    public static final int PCSTATE_N = 1;
+
+    /**
+     * 是否设置预估强平价系数 0-否1-是
+     */
+    private Integer isForce;
+    
+    @TableField(exist = false)
+    private String account;
+    @TableField(exist = false)
+    private String accounts;
+    
+    @TableField(exist = false)
+    private String firstName;
+    
+    @TableField(exist = false)
+    private String secondName;
+    
+    @TableField(exist = false)
+    private String realName;
+    
+    @TableField(exist = false)
+    private BigDecimal coinNumber;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(exist = false)
+    private Date startTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(exist = false)
+    private Date endTime;
+    
+	/**
+	 * 查询条件:账号类型
+	 */
+	@TableField(exist = false)
+    private String isTest;
+
+    /**
+     * 滑点
+     */
+    private BigDecimal spread;
+
+    /**
+     * 平仓点数
+     */
+    private BigDecimal closingSpread;
+
+    /**
+     * 强平系数
+     */
+    private BigDecimal forceParam;
+
+    /**
+     * 合约仓位类型
+     */
+    private Integer contractPositionType;
+
+    /**
+     * 指纹解锁功能  1:是   0:否
+     */
+    private Integer fingerprintState;
+}

--
Gitblit v1.9.1