From 24b53bf61f66428727e1dcbc4abf4320d8f48d8c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 May 2021 17:21:20 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 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 49225a0..6f4966e 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
@@ -101,6 +101,15 @@
otcOrder.setEntrustMemberId(entrustOrder.getMemberId());
otcOrder.setOrderType(OtcEntrustOrder.ORDER_TYPE_B);
+ MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(entrustOrder.getMemberId(), 3, "1");
+ if (defualtMethod == null) {
+ throw new GlobalException("对方未设置默认支付方式");
+ }
+
+ otcOrder.setBankName(defualtMethod.getBank());
+ otcOrder.setBankNo(defualtMethod.getAccount());
+ otcOrder.setCardName(defualtMethod.getName());
+
OtcOrder sale = new OtcOrder();
BeanUtil.copyProperties(otcOrder, sale);
sale.setMemberId(entrustOrder.getMemberId());
@@ -179,6 +188,14 @@
buy.setMemberId(entrustOrder.getMemberId());
buy.setOppositeMemberId(member.getId());
buy.setOrderType(OtcEntrustOrder.ORDER_TYPE_B);
+
+ MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(member.getId(), 3, "1");
+ if (defualtMethod == null) {
+ throw new GlobalException("未设置默认支付方式");
+ }
+ buy.setBankName(defualtMethod.getBank());
+ buy.setBankNo(defualtMethod.getAccount());
+ buy.setCardName(defualtMethod.getName());
otcEntrustOrderDao.updateRemainAmount(entrustOrder.getId(), orderAddDto.getUsdtAmount().negate());
this.baseMapper.insert(otcOrder);
@@ -278,16 +295,17 @@
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.setPayTime(buyOrder.getPayTime());
if (!buyOrder.getMemberId().equals(buyOrder.getEntrustMemberId())) {
OtcMarketBussiness otcMb = otcMarketBussinessDao.selectMarketBussinessByMemberId(buyOrder.getEntrustMemberId());
@@ -317,6 +335,8 @@
if (saleOrder == null) {
return Result.fail("参数错误");
}
+ MemberEntity buyMember = memberDao.selectById(saleOrder.getOppositeMemberId());
+
SaleOrderDetailVo saleDetail = new SaleOrderDetailVo();
saleDetail.setOrderNo(saleOrder.getOrderNo());
@@ -327,6 +347,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