From 1185fe008ccf76d26272df82146d0ac1d750cb4c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 04 Jun 2021 11:42:50 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 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 18c5555..e925174 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,11 +1,13 @@
package com.xcong.excoin.modules.otc.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -30,6 +32,7 @@
import com.xcong.excoin.modules.otc.vo.BuyOrderDetailVo;
import com.xcong.excoin.modules.otc.vo.OrderListVo;
import com.xcong.excoin.modules.otc.vo.SaleOrderDetailVo;
+import com.xcong.excoin.rabbit.producer.OtcProducter;
import com.xcong.excoin.utils.RedisUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -55,12 +58,15 @@
private final OtcBlackListDao otcBlackListDao;
private final OtcSettingDao otcSettingDao;
private final RedisUtils redisUtils;
+ private final OtcProducter otcProducter;
@Override
@Transactional(rollbackFor = Exception.class)
public Result buyOrder(OtcOrderAddDto orderAddDto) {
MemberEntity member = LoginUserUtils.getAppLoginUser();
+
+// MemberEntity member = memberDao.selectById(445L);
OtcEntrustOrder entrustOrder = otcEntrustOrderDao.selectById(orderAddDto.getId());
if (entrustOrder == null) {
throw new GlobalException("委托单不存在");
@@ -76,6 +82,7 @@
OtcSetting setting = otcSettingDao.selectById(1L);
String times = redisUtils.getString(AppContants.OTC_ORDER_CANCEL_TIMES + member.getId());
+ times = times == null ? "0" :times;
if (setting.getCancellNum() <= Integer.parseInt(times)) {
throw new GlobalException("订单取消次数过多, 限制交易24小时");
}
@@ -92,9 +99,22 @@
throw new GlobalException("剩余数量不足");
}
- BigDecimal cny = orderAddDto.getUsdtAmount().multiply(entrustOrder.getUnitPrice());
- if (cny.compareTo(orderAddDto.getCnyAmount()) != 0) {
+ BigDecimal cny = orderAddDto.getUsdtAmount().multiply(entrustOrder.getUnitPrice()).setScale(2, BigDecimal.ROUND_DOWN);
+ BigDecimal usdt = orderAddDto.getCnyAmount().divide(entrustOrder.getUnitPrice(), 2, BigDecimal.ROUND_DOWN);
+ if (cny.compareTo(orderAddDto.getCnyAmount()) != 0 && usdt.compareTo(orderAddDto.getUsdtAmount()) != 0) {
throw new GlobalException("数量与金额不符");
+ }
+ /**
+ * 最多三单未付款
+ */
+ QueryWrapper<OtcOrder> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("member_id",member.getId());
+ objectQueryWrapper.lt("status",OtcOrder.STATUS_PAY);
+ List<OtcOrder> otcOrders = this.baseMapper.selectList(objectQueryWrapper);
+ if(CollUtil.isNotEmpty(otcOrders)){
+ if(otcOrders.size() >= 3){
+ throw new GlobalException("最多可同时有三个待付款订单");
+ }
}
OtcOrder otcOrder = new OtcOrder();
@@ -155,6 +175,7 @@
OtcSetting setting = otcSettingDao.selectById(1L);
String times = redisUtils.getString(AppContants.OTC_ORDER_CANCEL_TIMES + member.getId());
+ times = times == null ? "0" :times;
if (setting.getCancellNum() <= Integer.parseInt(times)) {
throw new GlobalException("订单取消次数过多, 限制交易24小时");
}
@@ -181,7 +202,8 @@
}
BigDecimal cny = orderAddDto.getUsdtAmount().multiply(entrustOrder.getUnitPrice());
- if (cny.compareTo(orderAddDto.getCnyAmount()) != 0) {
+ BigDecimal usdt = orderAddDto.getCnyAmount().divide(entrustOrder.getUnitPrice(), 2, BigDecimal.ROUND_DOWN);
+ if (cny.compareTo(orderAddDto.getCnyAmount()) != 0 && usdt.compareTo(orderAddDto.getUsdtAmount()) != 0) {
throw new GlobalException("数量与金额不符");
}
@@ -297,6 +319,7 @@
memberWalletCoinDao.reduceFrozenBalance(saleWallet.getId(), buyOrder.getCoinAmount());
this.baseMapper.updateOrderStatusByOrderNo(OtcOrder.STATUS_FINISH, null, otcOrder.getOrderNo());
+ otcProducter.sendMarketBussinessMsg(otcOrder.getEntrustOrderId(), OtcOrder.STATUS_FINISH);
}
@Override
@@ -320,7 +343,7 @@
buyDetail.setTotalAmount(buyOrder.getTotalAmount());
buyDetail.setUnitPrice(buyOrder.getUnitPrice());
buyDetail.setCreateTime(buyOrder.getCreateTime());
- buyDetail.setIsMb(member.getIsTrader());
+ buyDetail.setIsMb(member.getAccountType() == 1 ? 2 : 1);
buyDetail.setPayName(buyOrder.getPayName());
buyDetail.setIsOwnEntrust(member.getId().equals(buyOrder.getEntrustMemberId()) ? 1 : 2);
@@ -335,6 +358,9 @@
}
buyDetail.setSaleName(saleMember.getName());
+
+ buyDetail.setSaleMemberId(saleMember.getId());
+ buyDetail.setMemberId(member.getId());
buyDetail.setBankName(buyOrder.getBankName());
buyDetail.setBankNo(buyOrder.getBankNo());
@@ -378,9 +404,13 @@
saleDetail.setTotalAmount(saleOrder.getTotalAmount());
saleDetail.setUnitPrice(saleOrder.getUnitPrice());
saleDetail.setCreateTime(saleOrder.getCreateTime());
- saleDetail.setIsMb(member.getIsTrader());
+ saleDetail.setIsMb(member.getAccountType() == 1 ? 2 : 1);
saleDetail.setPayName(saleOrder.getPayName());
+
saleDetail.setSaleName(buyMember.getName());
+ saleDetail.setSaleMemberId(buyMember.getId());
+ saleDetail.setMemberId(member.getId());
+
saleDetail.setPayType(saleOrder.getPayType());
saleDetail.setIsOwnEntrust(member.getId().equals(saleOrder.getEntrustMemberId()) ? 1 : 2);
@@ -439,6 +469,8 @@
otcEntrustOrderDao.updateRemainAmount(otcOrder.getEntrustOrderId(), otcOrder.getCoinAmount());
this.baseMapper.updateOrderStatusByOrderNo(OtcOrder.STATUS_CANCEL, null, otcOrder.getOrderNo());
+
+ otcProducter.sendMarketBussinessMsg(otcOrder.getEntrustOrderId(), OtcOrder.STATUS_CANCEL);
}
@Override
--
Gitblit v1.9.1