From b5003e2590cd2621061c6fd0ac731b5ddee6b715 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 May 2021 20:28:02 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 2efac64..d12c394 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
@@ -102,6 +102,10 @@
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());
@@ -109,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);
@@ -186,6 +190,9 @@
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());
@@ -226,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());
@@ -288,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());
@@ -296,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())) {
@@ -327,6 +336,8 @@
if (saleOrder == null) {
return Result.fail("参数错误");
}
+ MemberEntity buyMember = memberDao.selectById(saleOrder.getOppositeMemberId());
+
SaleOrderDetailVo saleDetail = new SaleOrderDetailVo();
saleDetail.setOrderNo(saleOrder.getOrderNo());
@@ -337,6 +348,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