From 7313bee2cdb9cec77b4e5447abf9d9c9c2e119b5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 20 May 2021 18:08:13 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 5 +++++
src/main/java/com/xcong/excoin/modules/otc/vo/BuyOrderDetailVo.java | 3 +++
src/main/java/com/xcong/excoin/modules/otc/vo/SaleOrderDetailVo.java | 3 +++
src/main/java/com/xcong/excoin/modules/otc/dto/OtcOrderAddDto.java | 2 ++
4 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/dto/OtcOrderAddDto.java b/src/main/java/com/xcong/excoin/modules/otc/dto/OtcOrderAddDto.java
index 91ee279..afa166b 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/dto/OtcOrderAddDto.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/dto/OtcOrderAddDto.java
@@ -4,11 +4,13 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.RequiredArgsConstructor;
import org.jetbrains.annotations.NotNull;
import java.math.BigDecimal;
@Data
+@RequiredArgsConstructor
@ApiModel(value = "OtcOrderAddDto", description = "提交订单接口参数接收类")
public class OtcOrderAddDto {
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
index e9379dc..153f899 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
@@ -1,6 +1,8 @@
package com.xcong.excoin.modules.otc.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -283,6 +285,9 @@
buyDetail.setOrderCnt(otcMb.getBuyCnt());
}
+ long between = DateUtil.between(buyOrder.getCreateTime(), new Date(), DateUnit.SECOND);
+ buyDetail.setTimes(between);
+
return Result.ok(buyDetail);
}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/BuyOrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/BuyOrderDetailVo.java
index 43e877d..e68e87c 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/vo/BuyOrderDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/BuyOrderDetailVo.java
@@ -59,4 +59,7 @@
@ApiModelProperty(value = "订单状态 1-已提交 2-已付款 3-完成")
private Integer status;
+
+ @ApiModelProperty(value = "剩余秒数")
+ private Long times;
}
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
index 8175747..9107286 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/vo/SaleOrderDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/SaleOrderDetailVo.java
@@ -53,4 +53,7 @@
@ApiModelProperty(value = "是否市商 1是 2否")
private Integer isMb;
+
+ @ApiModelProperty(value = "剩余秒数")
+ private Long times;
}
--
Gitblit v1.9.1