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

diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/MarketBussinessInfoVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/MarketBussinessInfoVo.java
new file mode 100644
index 0000000..a85e25e
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/MarketBussinessInfoVo.java
@@ -0,0 +1,51 @@
+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.List;
+
+@Data
+@ApiModel(value = "MarketBussinessInfoVo", description = "获取市商信息接口返回参数类")
+public class MarketBussinessInfoVo {
+
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    @ApiModelProperty(value = "会员ID")
+    private Long memberId;
+
+    @ApiModelProperty(value = "昵称")
+    private String nikename;
+
+    @ApiModelProperty(value = "审核状态", example = "1-待审核2-审核通过3-审核拒绝")
+    private Integer status;
+
+    @ApiModelProperty(value = "服务人数")
+    private Integer buyCnt;
+
+    @ApiModelProperty(value = "总单数")
+    private Integer totalOrderCnt;
+
+    @ApiModelProperty(value = "完成率")
+    private BigDecimal finishRatio;
+
+    @ApiModelProperty(value = "平均付款时间")
+    private Integer avgPayTime;
+
+    @ApiModelProperty(value = "平均放币时间")
+    private Integer avgCoinTime;
+
+    @ApiModelProperty(value = "卖单")
+    private List<EntrustListInfoVo> sales;
+
+    @ApiModelProperty(value = "买单")
+    private List<EntrustListInfoVo> buys;
+
+    public BigDecimal getFinishRatio() {
+        return finishRatio.multiply(BigDecimal.valueOf(100)).setScale(2, BigDecimal.ROUND_DOWN);
+    }
+}

--
Gitblit v1.9.1