From 96f952e6466c45508ea17d917be4fc60eef04972 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 May 2021 20:16:01 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 e76d75b..c8c924e 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
@@ -113,7 +113,7 @@
OtcOrder sale = new OtcOrder();
BeanUtil.copyProperties(otcOrder, sale);
sale.setMemberId(entrustOrder.getMemberId());
- otcOrder.setOppositeMemberId(member.getId());
+ sale.setOppositeMemberId(member.getId());
sale.setOrderType(OtcEntrustOrder.ORDER_TYPE_S);
otcEntrustOrderDao.updateRemainAmount(entrustOrder.getId(), orderAddDto.getUsdtAmount().negate());
this.baseMapper.insert(otcOrder);
@@ -180,13 +180,13 @@
otcOrder.setStatus(OtcOrder.STATUS_SUBMIT);
otcOrder.setPayTime(new Date());
otcOrder.setEntrustMemberId(entrustOrder.getMemberId());
- otcOrder.setOppositeMemberId(entrustOrder.getMemberId());
+ otcOrder.setOppositeMemberId(member.getId());
otcOrder.setOrderType(OtcEntrustOrder.ORDER_TYPE_S);
OtcOrder buy = new OtcOrder();
BeanUtil.copyProperties(otcOrder, buy);
buy.setMemberId(entrustOrder.getMemberId());
- buy.setOppositeMemberId(member.getId());
+ buy.setOppositeMemberId(entrustOrder.getMemberId());
buy.setOrderType(OtcEntrustOrder.ORDER_TYPE_B);
MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(member.getId(), 3, "1");
@@ -233,6 +233,7 @@
throw new GlobalException("不是购买单");
}
+ log.info("======={}", hasPayDto.getName());
if (StrUtil.isBlank(hasPayDto.getName())) {
MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(member.getId(), 3, "1");
hasPayDto.setName(defualtMethod.getName());
@@ -295,6 +296,7 @@
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());
@@ -303,7 +305,7 @@
buyDetail.setBankName(buyOrder.getBankName());
buyDetail.setBankNo(buyOrder.getBankNo());
- buyDetail.setPayName(buyOrder.getCardName());
+ buyDetail.setCardName(buyOrder.getCardName());
buyDetail.setPayTime(buyOrder.getPayTime());
if (!buyOrder.getMemberId().equals(buyOrder.getEntrustMemberId())) {
--
Gitblit v1.9.1