From 8a6e55cccdef5989b296b04a2c514341db70195f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 24 May 2021 14:37:11 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 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 5488a3b..a2b1473 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
@@ -95,14 +95,30 @@
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());
otcOrder.setOrderType(OtcEntrustOrder.ORDER_TYPE_B);
+ MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(entrustOrder.getMemberId(), null, "1");
+ if (defualtMethod == null) {
+ throw new GlobalException("对方未设置默认支付方式");
+ }
+ if (MemberPaymentMethodEntity.PAYMENTTYPE_CARD.toString().equals(defualtMethod.getPaymentType())) {
+ otcOrder.setBankName(defualtMethod.getBank());
+ } else {
+ otcOrder.setBankName(defualtMethod.getPaymentQrcode());
+ }
+
+ otcOrder.setBankNo(defualtMethod.getAccount());
+ otcOrder.setCardName(defualtMethod.getName());
+ otcOrder.setPayType(defualtMethod.getPaymentType());
+
OtcOrder sale = new OtcOrder();
BeanUtil.copyProperties(otcOrder, sale);
sale.setMemberId(entrustOrder.getMemberId());
+ sale.setOppositeMemberId(member.getId());
sale.setOrderType(OtcEntrustOrder.ORDER_TYPE_S);
otcEntrustOrderDao.updateRemainAmount(entrustOrder.getId(), orderAddDto.getUsdtAmount().negate());
this.baseMapper.insert(otcOrder);
@@ -169,12 +185,28 @@
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);
+
+ MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(member.getId(), null, "1");
+ if (defualtMethod == null) {
+ throw new GlobalException("未设置默认支付方式");
+ }
+
+ if (MemberPaymentMethodEntity.PAYMENTTYPE_CARD.toString().equals(defualtMethod.getPaymentType())) {
+ buy.setBankName(defualtMethod.getBank());
+ } else {
+ buy.setBankName(defualtMethod.getPaymentQrcode());
+ }
+ buy.setBankNo(defualtMethod.getAccount());
+ buy.setCardName(defualtMethod.getName());
+ buy.setPayType(defualtMethod.getPaymentType());
otcEntrustOrderDao.updateRemainAmount(entrustOrder.getId(), orderAddDto.getUsdtAmount().negate());
this.baseMapper.insert(otcOrder);
@@ -213,7 +245,7 @@
}
if (StrUtil.isBlank(hasPayDto.getName())) {
- MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(member.getId(), 3, "1");
+ MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(member.getId(), null, "1");
hasPayDto.setName(defualtMethod.getName());
}
@@ -274,16 +306,18 @@
buyDetail.setUnitPrice(buyOrder.getUnitPrice());
buyDetail.setCreateTime(buyOrder.getCreateTime());
buyDetail.setIsMb(member.getIsTrader());
+ buyDetail.setPayName(buyOrder.getPayName());
OtcOrder saleOrder = this.baseMapper.selectOrderByOrderNoAndType(otcOrder.getOrderNo(), OtcEntrustOrder.ORDER_TYPE_S);
MemberEntity saleMember = memberDao.selectById(saleOrder.getMemberId());
buyDetail.setSaleName(saleMember.getName());
- MemberPaymentMethodEntity defaultMethod = memberPaymentMethodDao.selectDefualtMethod(saleOrder.getMemberId(), 3, "1");
- buyDetail.setBankName(defaultMethod.getName());
- buyDetail.setBankNo(defaultMethod.getAccount());
- buyDetail.setPayName(defaultMethod.getName());
- buyDetail.setPayTime(buyDetail.getPayTime());
+
+ buyDetail.setBankName(buyOrder.getBankName());
+ buyDetail.setBankNo(buyOrder.getBankNo());
+ buyDetail.setCardName(buyOrder.getCardName());
+ buyDetail.setPayType(buyOrder.getPayType());
+ buyDetail.setPayTime(buyOrder.getPayTime());
if (!buyOrder.getMemberId().equals(buyOrder.getEntrustMemberId())) {
OtcMarketBussiness otcMb = otcMarketBussinessDao.selectMarketBussinessByMemberId(buyOrder.getEntrustMemberId());
@@ -291,7 +325,6 @@
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);
@@ -313,6 +346,8 @@
if (saleOrder == null) {
return Result.fail("参数错误");
}
+ MemberEntity buyMember = memberDao.selectById(saleOrder.getOppositeMemberId());
+
SaleOrderDetailVo saleDetail = new SaleOrderDetailVo();
saleDetail.setOrderNo(saleOrder.getOrderNo());
@@ -323,6 +358,7 @@
saleDetail.setCreateTime(saleOrder.getCreateTime());
saleDetail.setIsMb(member.getIsTrader());
saleDetail.setPayName(saleOrder.getPayName());
+ saleDetail.setSaleName(buyMember.getName());
if (!saleOrder.getMemberId().equals(saleOrder.getEntrustMemberId())) {
OtcMarketBussiness otcMb = otcMarketBussinessDao.selectMarketBussinessByMemberId(saleOrder.getEntrustMemberId());
--
Gitblit v1.9.1