From ab4f788aaba47910e3edf0fe1b001e56cdea26db Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 20 May 2021 16:54:19 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 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 14c5ee3..753715e 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 @@ -142,14 +142,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 @@ -183,18 +185,14 @@ @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()); EntrustOrderDetailVo detail = OtcEntrustOrderMapper.INSTANCE.entityToOrderDetail(otcEntrustOrder); + detail.setName(member.getName()); return Result.ok(detail); } } -- Gitblit v1.9.1