From f8034d74a80c0ccc989bd79dc864dbf7cb02d03c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 20 May 2021 19:50:37 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
index 9557361..2002879 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
@@ -40,9 +40,9 @@
@RequiredArgsConstructor
public class OtcEntrustOrderServiceImpl extends ServiceImpl<OtcEntrustOrderDao, OtcEntrustOrder> implements OtcEntrustOrderService {
- private final OtcMarketBussinessDao otcMarketBussinessDao;
private final MemberDao memberDao;
private final MemberPaymentMethodDao memberPaymentMethodDao;
+ private final OtcMarketBussinessDao otcMarketBussinessDao;
private final MemberWalletCoinDao memberWalletCoinDao;
private final OtcOrderDao otcOrderDao;
private final CommonService commonService;
@@ -75,11 +75,10 @@
memberWalletCoinDao.updateFrozenBalance(member.getId(), coinWallet.getId(), totalAmount);
}
- OtcMarketBussiness mb = otcMarketBussinessDao.selectMarketBussinessByMemberId(member.getId());
- if (mb == null) {
+// OtcMarketBussiness mb = otcMarketBussinessDao.selectMarketBussinessByMemberId(member.getId());
+ if (member.getIsTrader() == 2) {
otcEntrustOrder.setIsMb(OtcEntrustOrder.IS_MB_N);
} else {
- otcEntrustOrder.setMbId(mb.getId());
otcEntrustOrder.setIsMb(OtcEntrustOrder.IS_MB_Y);
}
@@ -114,11 +113,9 @@
throw new GlobalException("类型错误");
}
- OtcMarketBussiness mb = otcMarketBussinessDao.selectMarketBussinessByMemberId(member.getId());
- if (mb == null) {
+ if (member.getIsTrader() == 2) {
otcEntrustOrder.setIsMb(OtcEntrustOrder.IS_MB_N);
} else {
- otcEntrustOrder.setMbId(mb.getId());
otcEntrustOrder.setIsMb(OtcEntrustOrder.IS_MB_Y);
}
@@ -146,14 +143,16 @@
}
@Override
- public List<EntrustListInfoVo> findOwnEntrustOrder() {
+ public List<EntrustListInfoVo> findOwnEntrustOrder(EntrustOrderListDto orderListDto) {
MemberEntity member = LoginUserUtils.getAppLoginUser();
OtcEntrustOrder query = new OtcEntrustOrder();
query.setStatus(3);
query.setMemberId(member.getId());
- List<OtcEntrustOrder> otcEntrustOrders = this.baseMapper.selectEntrustOrderByOrderType(query);
- return OtcEntrustOrderMapper.INSTANCE.entrustToListInfoVoList(otcEntrustOrders);
+
+ Page<OtcEntrustOrder> page = new Page<>(orderListDto.getPageNum(), orderListDto.getPageSize());
+ IPage<OtcEntrustOrder> result = this.baseMapper.selectOwnEntrustListInPage(query, page);
+ return OtcEntrustOrderMapper.INSTANCE.entrustToListInfoVoList(result.getRecords());
}
@Override
@@ -187,18 +186,17 @@
@Override
public Result findEntrustOrderDetail(Long id) {
- MemberEntity member = LoginUserUtils.getAppLoginUser();
-
OtcEntrustOrder otcEntrustOrder = this.baseMapper.selectById(id);
if (otcEntrustOrder == null) {
return Result.fail("参数错误");
}
- if (!member.getId().equals(otcEntrustOrder.getMemberId())) {
- return Result.fail("请求有误");
- }
-
+ MemberEntity member = memberDao.selectById(otcEntrustOrder.getMemberId());
+ OtcMarketBussiness mb = otcMarketBussinessDao.selectMarketBussinessByMemberId(member.getId());
EntrustOrderDetailVo detail = OtcEntrustOrderMapper.INSTANCE.entityToOrderDetail(otcEntrustOrder);
+ detail.setName(member.getName());
+ detail.setOrderCnt(mb.getBuyCnt());
+ detail.setFinishRatio(mb.getFinishRatio());
return Result.ok(detail);
}
}
--
Gitblit v1.9.1