From d30d959c8f249c20b39e66dd0c48341a77751d21 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 May 2021 17:03:32 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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..e76d75b 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());
@@ -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());
@@ -327,6 +334,8 @@
if (saleOrder == null) {
return Result.fail("参数错误");
}
+ MemberEntity buyMember = memberDao.selectById(saleOrder.getOppositeMemberId());
+
SaleOrderDetailVo saleDetail = new SaleOrderDetailVo();
saleDetail.setOrderNo(saleOrder.getOrderNo());
@@ -337,6 +346,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