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/SaleOrderDetailVo.java | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/SaleOrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/SaleOrderDetailVo.java
new file mode 100644
index 0000000..f1ad32a
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/SaleOrderDetailVo.java
@@ -0,0 +1,73 @@
+package com.xcong.excoin.modules.otc.vo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "OtcOrderDetailVo", description = "otc订单详情")
+public class SaleOrderDetailVo {
+
+ @ApiModelProperty(value = "交易总额")
+ private BigDecimal totalAmount;
+
+ @ApiModelProperty(value = "交易数量")
+ private BigDecimal usdtAmount;
+
+ @ApiModelProperty(value = "单价")
+ private BigDecimal unitPrice;
+
+ @ApiModelProperty(value = "订单编号")
+ private String orderNo;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("下单时间")
+ private Date createTime;
+
+ @ApiModelProperty(value = "订单状态 1-已提交 2-已付款 3-完成")
+ private Integer status;
+
+ @ApiModelProperty(value = "姓名")
+ private String payName;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "支付时间")
+ private Date payTime;
+
+ @ApiModelProperty(value = "支付方式")
+ private String payType;
+
+ @ApiModelProperty(value = "商家昵称")
+ private String saleName;
+
+ @ApiModelProperty(value = "商家MemberId")
+ private Long saleMemberId;
+ @ApiModelProperty(value = "memberId")
+ private Long memberId;
+
+ @ApiModelProperty(value = "商家ID")
+ private Long mbId;
+
+ @ApiModelProperty(value = "订单数量")
+ private Integer orderCnt;
+
+ @ApiModelProperty(value = "完成率")
+ private BigDecimal finishRatio;
+
+ @ApiModelProperty(value = "是否市商 1是 2否")
+ private Integer isMb;
+
+ @ApiModelProperty(value = "剩余秒数")
+ private Long times;
+
+ @ApiModelProperty(value = "是否已拉黑")
+ private Integer isBlack;
+
+ @ApiModelProperty(value = "是否自己的委托单 1-是 2-否")
+ private Integer isOwnEntrust;
+}
--
Gitblit v1.9.1