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/vo/ChatOrderVo.java |   62 +++++++++++++++++++++++++++++++
 1 files changed, 62 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/ChatOrderVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/ChatOrderVo.java
new file mode 100644
index 0000000..54acbb7
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/ChatOrderVo.java
@@ -0,0 +1,62 @@
+package com.xcong.excoin.modules.otc.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "ChatOrderVo", description = "返回参数类")
+public class ChatOrderVo {
+
+    /**
+     * 订单编号
+     */
+
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+
+    private Long memberId;
+
+    /**
+     * 单价
+     */
+
+    @ApiModelProperty(value = "单价")
+    private BigDecimal unitPrice;
+
+    /**
+     * 数量
+     */
+
+    @ApiModelProperty(value = "数量")
+    private BigDecimal usdtAmount;
+
+    /**
+     * 总额
+     */
+
+    @ApiModelProperty(value = "总额")
+    private BigDecimal totalAmount;
+
+    /**
+     * 订单状态 1-已提交未付款2-已付款3-已完成
+     */
+
+    @ApiModelProperty(value = "订单状态 1-已提交未付款2-已付款3-已完成4-已取消")
+    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;
+
+
+    /**
+     * 订单类型 B-买 S-卖
+     */
+
+    @ApiModelProperty(value = "订单类型 B-买 S-卖")
+    private String orderType;
+}

--
Gitblit v1.9.1