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

diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustOrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustOrderDetailVo.java
new file mode 100644
index 0000000..f0db3f5
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustOrderDetailVo.java
@@ -0,0 +1,82 @@
+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 = "EntrustOrderDetailVo", description = "获取委托单详情接口返回参数类")
+public class EntrustOrderDetailVo {
+
+    @ApiModelProperty(value = "委托单号")
+    private String orderNo;
+
+    @ApiModelProperty(value = "单价")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty(value = "委托数量")
+    private BigDecimal amount;
+
+    @ApiModelProperty(value = "剩余数量")
+    private BigDecimal remainAmount;
+
+    @ApiModelProperty(value = "委托金额")
+    private BigDecimal totalAmount;
+
+    @ApiModelProperty(value = "限额 下限")
+    private BigDecimal min;
+
+    @ApiModelProperty(value = "限额 上限")
+    private BigDecimal max;
+
+    @ApiModelProperty(value = "类型 B-购买 S-出售")
+    private String orderType;
+
+    @ApiModelProperty(value = "上/下线 1-上线 2-下线")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    @ApiModelProperty(value = "商家昵称")
+    private String name;
+
+    @ApiModelProperty(value = "订单数量")
+    private Integer orderCnt;
+
+    @ApiModelProperty(value = "完成率")
+    private BigDecimal finishRatio;
+
+    @ApiModelProperty(value = "支付方式")
+    private String payType;
+
+    public BigDecimal getUnitPrice() {
+        return unitPrice.setScale(2, BigDecimal.ROUND_DOWN);
+    }
+
+    public BigDecimal getAmount() {
+        return amount.setScale(2, BigDecimal.ROUND_DOWN);
+    }
+
+    public BigDecimal getRemainAmount() {
+        return remainAmount.setScale(2, BigDecimal.ROUND_DOWN);
+    }
+
+    public BigDecimal getTotalAmount() {
+        return totalAmount.setScale(2, BigDecimal.ROUND_DOWN);
+    }
+
+    public BigDecimal getMin() {
+        return min.setScale(2, BigDecimal.ROUND_DOWN);
+    }
+
+    public BigDecimal getMax() {
+        return max.setScale(2, BigDecimal.ROUND_DOWN);
+    }
+}

--
Gitblit v1.9.1