From b0a8dac363010bf797d4dcea7cfa5c40fb27a0ec Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 24 May 2021 11:30:46 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 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 d12c394..1f0065a 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
@@ -101,14 +101,19 @@
otcOrder.setEntrustMemberId(entrustOrder.getMemberId());
otcOrder.setOrderType(OtcEntrustOrder.ORDER_TYPE_B);
- MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(entrustOrder.getMemberId(), 3, "1");
+ MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(entrustOrder.getMemberId(), null, "1");
if (defualtMethod == null) {
throw new GlobalException("对方未设置默认支付方式");
}
+ if (MemberPaymentMethodEntity.PAYMENTTYPE_CARD.toString().equals(defualtMethod.getPaymentType())) {
+ otcOrder.setBankName(defualtMethod.getBank());
+ } else {
+ otcOrder.setBankName(defualtMethod.getPaymentQrcode());
+ }
- otcOrder.setBankName(defualtMethod.getBank());
otcOrder.setBankNo(defualtMethod.getAccount());
otcOrder.setCardName(defualtMethod.getName());
+ otcOrder.setPayType(defualtMethod.getPaymentType());
OtcOrder sale = new OtcOrder();
BeanUtil.copyProperties(otcOrder, sale);
@@ -189,13 +194,19 @@
buy.setOppositeMemberId(member.getId());
buy.setOrderType(OtcEntrustOrder.ORDER_TYPE_B);
- MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(member.getId(), 3, "1");
+ MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(member.getId(), null, "1");
if (defualtMethod == null) {
throw new GlobalException("未设置默认支付方式");
}
- buy.setBankName(defualtMethod.getBank());
+
+ if (MemberPaymentMethodEntity.PAYMENTTYPE_CARD.toString().equals(defualtMethod.getPaymentType())) {
+ buy.setBankName(defualtMethod.getBank());
+ } else {
+ buy.setBankName(defualtMethod.getPaymentQrcode());
+ }
buy.setBankNo(defualtMethod.getAccount());
buy.setCardName(defualtMethod.getName());
+ buy.setPayType(defualtMethod.getPaymentType());
otcEntrustOrderDao.updateRemainAmount(entrustOrder.getId(), orderAddDto.getUsdtAmount().negate());
this.baseMapper.insert(otcOrder);
@@ -306,6 +317,7 @@
buyDetail.setBankName(buyOrder.getBankName());
buyDetail.setBankNo(buyOrder.getBankNo());
buyDetail.setCardName(buyOrder.getCardName());
+ buyDetail.setPayType(buyOrder.getPayType());
buyDetail.setPayTime(buyOrder.getPayTime());
if (!buyOrder.getMemberId().equals(buyOrder.getEntrustMemberId())) {
--
Gitblit v1.9.1