From acdbbe2c8e33765b2904d7fc48a18bc9001eeb82 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 May 2021 16:17:37 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 24 +++++++++++++++++++-----
1 files changed, 19 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 5488a3b..2efac64 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,21 @@
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(), 3, "1");
+ otcOrder.setBankName(defualtMethod.getBank());
+ otcOrder.setBankNo(defualtMethod.getAccount());
+ otcOrder.setCardName(defualtMethod.getName());
+
OtcOrder sale = new OtcOrder();
BeanUtil.copyProperties(otcOrder, sale);
sale.setMemberId(entrustOrder.getMemberId());
+ otcOrder.setOppositeMemberId(member.getId());
sale.setOrderType(OtcEntrustOrder.ORDER_TYPE_S);
otcEntrustOrderDao.updateRemainAmount(entrustOrder.getId(), orderAddDto.getUsdtAmount().negate());
this.baseMapper.insert(otcOrder);
@@ -169,12 +176,19 @@
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(), 3, "1");
+ buy.setBankName(defualtMethod.getBank());
+ buy.setBankNo(defualtMethod.getAccount());
+ buy.setCardName(defualtMethod.getName());
otcEntrustOrderDao.updateRemainAmount(entrustOrder.getId(), orderAddDto.getUsdtAmount().negate());
this.baseMapper.insert(otcOrder);
@@ -279,11 +293,11 @@
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.setPayName(buyOrder.getCardName());
+ buyDetail.setPayTime(buyOrder.getPayTime());
if (!buyOrder.getMemberId().equals(buyOrder.getEntrustMemberId())) {
OtcMarketBussiness otcMb = otcMarketBussinessDao.selectMarketBussinessByMemberId(buyOrder.getEntrustMemberId());
--
Gitblit v1.9.1