From 10673abd11b3ade3be86c1c422453c70de7dfef8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 May 2021 15:22:56 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 67 ++++++++++++++++++++++++++++-----
1 files changed, 56 insertions(+), 11 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 e9379dc..49225a0 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;
@@ -54,22 +56,22 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void buyOrder(OtcOrderAddDto orderAddDto) {
+ public Result buyOrder(OtcOrderAddDto orderAddDto) {
MemberEntity member = LoginUserUtils.getAppLoginUser();
OtcEntrustOrder entrustOrder = otcEntrustOrderDao.selectById(orderAddDto.getId());
if (entrustOrder == null) {
throw new GlobalException("委托单不存在");
}
+ if (member.getId().equals(entrustOrder.getMemberId())) {
+ throw new GlobalException("不能购买自己的委托单");
+ }
+
if (!OtcEntrustOrder.ORDER_TYPE_S.equals(entrustOrder.getOrderType())) {
throw new GlobalException("无法购买");
}
- if (orderAddDto.getUsdtAmount().compareTo(entrustOrder.getRemainCoinAmount()) > 0) {
- throw new GlobalException("无足够的USDT");
- }
-
- if (orderAddDto.getUsdtAmount().compareTo(entrustOrder.getLimitMinAmount()) < 0) {
+ if (orderAddDto.getCnyAmount().compareTo(entrustOrder.getLimitMinAmount()) < 0) {
throw new GlobalException("低于最低限额");
}
@@ -77,7 +79,7 @@
throw new GlobalException("高于最高限额");
}
- if (orderAddDto.getCnyAmount().compareTo(entrustOrder.getRemainCoinAmount()) > 0) {
+ if (orderAddDto.getUsdtAmount().compareTo(entrustOrder.getRemainCoinAmount()) > 0) {
throw new GlobalException("剩余数量不足");
}
@@ -93,6 +95,7 @@
otcOrder.setCoinAmount(orderAddDto.getUsdtAmount());
otcOrder.setTotalAmount(orderAddDto.getCnyAmount());
otcOrder.setMemberId(member.getId());
+ otcOrder.setOppositeMemberId(entrustOrder.getMemberId());
otcOrder.setStatus(OtcOrder.STATUS_SUBMIT);
otcOrder.setPayTime(new Date());
otcOrder.setEntrustMemberId(entrustOrder.getMemberId());
@@ -101,19 +104,26 @@
OtcOrder sale = new OtcOrder();
BeanUtil.copyProperties(otcOrder, sale);
sale.setMemberId(entrustOrder.getMemberId());
+ otcOrder.setOppositeMemberId(member.getId());
sale.setOrderType(OtcEntrustOrder.ORDER_TYPE_S);
otcEntrustOrderDao.updateRemainAmount(entrustOrder.getId(), orderAddDto.getUsdtAmount().negate());
this.baseMapper.insert(otcOrder);
this.baseMapper.insert(sale);
+
+ return Result.ok("购买成功", otcOrder.getId());
}
@Override
@Transactional(rollbackFor = Exception.class)
- public void saleOrder(OtcOrderAddDto orderAddDto) {
+ public Result saleOrder(OtcOrderAddDto orderAddDto) {
MemberEntity member = LoginUserUtils.getAppLoginUser();
OtcEntrustOrder entrustOrder = otcEntrustOrderDao.selectById(orderAddDto.getId());
if (entrustOrder == null) {
throw new GlobalException("委托单不存在");
+ }
+
+ if (member.getId().equals(entrustOrder.getMemberId())) {
+ throw new GlobalException("不能购买自己的委托单");
}
if (!OtcEntrustOrder.ORDER_TYPE_B.equals(entrustOrder.getOrderType())) {
@@ -161,11 +171,13 @@
otcOrder.setStatus(OtcOrder.STATUS_SUBMIT);
otcOrder.setPayTime(new Date());
otcOrder.setEntrustMemberId(entrustOrder.getMemberId());
+ otcOrder.setOppositeMemberId(entrustOrder.getMemberId());
otcOrder.setOrderType(OtcEntrustOrder.ORDER_TYPE_S);
OtcOrder buy = new OtcOrder();
BeanUtil.copyProperties(otcOrder, buy);
buy.setMemberId(entrustOrder.getMemberId());
+ buy.setOppositeMemberId(member.getId());
buy.setOrderType(OtcEntrustOrder.ORDER_TYPE_B);
otcEntrustOrderDao.updateRemainAmount(entrustOrder.getId(), orderAddDto.getUsdtAmount().negate());
@@ -173,6 +185,7 @@
this.baseMapper.insert(buy);
memberWalletCoinDao.updateFrozenBalance(member.getId(), wallet.getId(), orderAddDto.getUsdtAmount());
+ return Result.ok("出售成功", otcOrder.getId());
}
@Override
@@ -240,7 +253,7 @@
// 出售者钱包冻结减少币
memberWalletCoinDao.reduceFrozenBalance(saleWallet.getId(), buyOrder.getCoinAmount());
- this.baseMapper.updateOrderStatusByOrderNo(OtcOrder.STATUS_PAY, null, otcOrder.getOrderNo());
+ this.baseMapper.updateOrderStatusByOrderNo(OtcOrder.STATUS_FINISH, null, otcOrder.getOrderNo());
}
@Override
@@ -263,7 +276,7 @@
buyDetail.setStatus(buyOrder.getStatus());
buyDetail.setTotalAmount(buyOrder.getTotalAmount());
buyDetail.setUnitPrice(buyOrder.getUnitPrice());
- buyDetail.setCreateTime(new Date());
+ buyDetail.setCreateTime(buyOrder.getCreateTime());
buyDetail.setIsMb(member.getIsTrader());
OtcOrder saleOrder = this.baseMapper.selectOrderByOrderNoAndType(otcOrder.getOrderNo(), OtcEntrustOrder.ORDER_TYPE_S);
@@ -281,6 +294,12 @@
buyDetail.setMbId(otcMb.getId());
buyDetail.setFinishRatio(otcMb.getFinishRatio());
buyDetail.setOrderCnt(otcMb.getBuyCnt());
+ }
+
+
+ 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);
@@ -305,7 +324,7 @@
saleDetail.setStatus(saleOrder.getStatus());
saleDetail.setTotalAmount(saleOrder.getTotalAmount());
saleDetail.setUnitPrice(saleOrder.getUnitPrice());
- saleDetail.setCreateTime(new Date());
+ saleDetail.setCreateTime(saleOrder.getCreateTime());
saleDetail.setIsMb(member.getIsTrader());
saleDetail.setPayName(saleOrder.getPayName());
@@ -316,6 +335,32 @@
saleDetail.setOrderCnt(otcMb.getBuyCnt());
}
+ if (OtcOrder.STATUS_SUBMIT.equals(saleOrder.getStatus())) {
+ long between = DateUtil.between(new Date(), DateUtil.offsetMinute(saleOrder.getCreateTime(), 30), DateUnit.SECOND, false);
+ saleDetail.setTimes(between);
+ }
+
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("不能取消");
+ }
+
+ OtcOrder saleOrder = this.baseMapper.selectOrderByOrderNoAndType(otcOrder.getOrderNo(), OtcEntrustOrder.ORDER_TYPE_S);
+ if (!saleOrder.getMemberId().equals(saleOrder.getEntrustMemberId())) {
+ MemberWalletCoinEntity wallet = memberWalletCoinDao.selectWalletCoinBymIdAndCode(saleOrder.getMemberId(), "USDT");
+ memberWalletCoinDao.subFrozenBalance(saleOrder.getMemberId(), wallet.getId(), saleOrder.getCoinAmount());
+ }
+
+ otcEntrustOrderDao.updateRemainAmount(otcOrder.getEntrustOrderId(), otcOrder.getCoinAmount());
+ this.baseMapper.updateOrderStatusByOrderNo(OtcOrder.STATUS_CANCEL, null, otcOrder.getOrderNo());
+ }
}
--
Gitblit v1.9.1