From 9d641b6dd286bb9a817d9d4e42e36d4743a4bfd6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 May 2021 10:14:47 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
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 0086fec..fe46ce8 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
@@ -292,8 +292,11 @@
buyDetail.setOrderCnt(otcMb.getBuyCnt());
}
- long between = DateUtil.between(buyOrder.getCreateTime(), new Date(), DateUnit.SECOND);
- buyDetail.setTimes(between);
+
+ if (OtcOrder.STATUS_SUBMIT.equals(buyOrder.getStatus())) {
+ long between = DateUtil.between(new Date(), DateUtil.offsetMinute(buyOrder.getCreateTime(), 30), DateUnit.SECOND, false);
+ buyDetail.setTimes(between);
+ }
return Result.ok(buyDetail);
}
@@ -330,4 +333,19 @@
return Result.ok(saleDetail);
}
+
+ @Override
+ public void cancelOrder(Long id) {
+ OtcOrder otcOrder = this.baseMapper.selectById(id);
+ if (otcOrder == null) {
+ throw new GlobalException("订单不存在");
+ }
+
+ if (!OtcOrder.STATUS_SUBMIT.equals(otcOrder.getStatus())) {
+ throw new GlobalException("不能取消");
+ }
+
+ otcEntrustOrderDao.updateRemainAmount(otcOrder.getEntrustOrderId(), otcOrder.getCoinAmount());
+ this.baseMapper.updateOrderStatusByOrderNo(OtcOrder.STATUS_CANCEL, null, otcOrder.getOrderNo());
+ }
}
--
Gitblit v1.9.1