From f757b44cf6e8ebc1a8942c9ded338544d7485d24 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 May 2021 17:53:47 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java |    9 +++++----
 1 files changed, 5 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..f47ab49 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");
@@ -295,6 +295,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 +304,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