From 751acf32f348ae67bf400f74f4601482105d44ee Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 25 May 2021 14:40:43 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 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 1f0065a..063802d 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
@@ -244,9 +244,8 @@
throw new GlobalException("不是购买单");
}
- log.info("======={}", hasPayDto.getName());
if (StrUtil.isBlank(hasPayDto.getName())) {
- MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(member.getId(), 3, "1");
+ MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(member.getId(), null, "1");
hasPayDto.setName(defualtMethod.getName());
}
@@ -327,7 +326,6 @@
buyDetail.setOrderCnt(otcMb.getBuyCnt());
}
-
if (OtcOrder.STATUS_SUBMIT.equals(buyOrder.getStatus())) {
long between = DateUtil.between(new Date(), DateUtil.offsetMinute(buyOrder.getCreateTime(), 30), DateUnit.SECOND, false);
buyDetail.setTimes(between);
@@ -361,6 +359,7 @@
saleDetail.setIsMb(member.getIsTrader());
saleDetail.setPayName(saleOrder.getPayName());
saleDetail.setSaleName(buyMember.getName());
+ saleDetail.setPayType(saleOrder.getPayType());
if (!saleOrder.getMemberId().equals(saleOrder.getEntrustMemberId())) {
OtcMarketBussiness otcMb = otcMarketBussinessDao.selectMarketBussinessByMemberId(saleOrder.getEntrustMemberId());
--
Gitblit v1.9.1