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 |    8 ++------
 src/main/java/com/xcong/excoin/modules/otc/vo/EntrustOrderDetailVo.java                 |    3 +++
 2 files changed, 5 insertions(+), 6 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 9c5e38f..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
@@ -185,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);
     }
 }
diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustOrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustOrderDetailVo.java
index a32025f..e6d4b5e 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustOrderDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustOrderDetailVo.java
@@ -44,6 +44,9 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
+    @ApiModelProperty(value = "商家昵称")
+    private String name;
+
     public BigDecimal getUnitPrice() {
         return unitPrice.setScale(2, BigDecimal.ROUND_DOWN);
     }

--
Gitblit v1.9.1