From 1a199909dd51facb507db98f799a9bab07c81557 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 20 May 2021 14:17:53 +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/dao/OtcEntrustOrderDao.java                  |    2 ++
 src/main/java/com/xcong/excoin/modules/otc/controller/OtcEntrustOrderController.java    |    6 +++---
 src/main/java/com/xcong/excoin/modules/otc/vo/EntrustListInfoVo.java                    |    3 +++
 src/main/java/com/xcong/excoin/modules/otc/service/OtcEntrustOrderService.java          |    2 +-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcEntrustOrderController.java b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcEntrustOrderController.java
index ba1d3eb..5d4db5f 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcEntrustOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcEntrustOrderController.java
@@ -62,9 +62,9 @@
     @ApiResponses({
             @ApiResponse(code = 200, message = "success", response = EntrustListInfoVo.class)
     })
-    @GetMapping(value = "/findOwnEntrustOrderList")
-    public Result findOwnEntrustOrderList() {
-        return Result.ok(otcEntrustOrderService.findOwnEntrustOrder());
+    @PostMapping(value = "/findOwnEntrustOrderList")
+    public Result findOwnEntrustOrderList(@RequestBody EntrustOrderListDto orderListDto) {
+        return Result.ok(otcEntrustOrderService.findOwnEntrustOrder(orderListDto));
     }
 
     @ApiOperation(value = "获取我的委托单详情")
diff --git a/src/main/java/com/xcong/excoin/modules/otc/dao/OtcEntrustOrderDao.java b/src/main/java/com/xcong/excoin/modules/otc/dao/OtcEntrustOrderDao.java
index 1b420b0..9a248a4 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/dao/OtcEntrustOrderDao.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/dao/OtcEntrustOrderDao.java
@@ -18,5 +18,7 @@
 
     List<OtcEntrustOrder> selectEntrustOrderByOrderType(@Param("record") OtcEntrustOrder otcEntrustOrder);
 
+    IPage<OtcEntrustOrder> selectOwnEntrustListInPage(@Param("record") OtcEntrustOrder otcEntrustOrder, Page<OtcEntrustOrder> page);
+
     int updateRemainAmount(@Param("id") Long id, @Param("amount") BigDecimal amount);
 }
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/OtcEntrustOrderService.java b/src/main/java/com/xcong/excoin/modules/otc/service/OtcEntrustOrderService.java
index 9176d3b..3253a14 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/OtcEntrustOrderService.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/OtcEntrustOrderService.java
@@ -19,7 +19,7 @@
 
     IPage<EntrustListVo> findEntrustListInPage(EntrustOrderListDto dto);
 
-    List<EntrustListInfoVo> findOwnEntrustOrder();
+    List<EntrustListInfoVo> findOwnEntrustOrder(EntrustOrderListDto orderListDto);
 
     void cancelEntrustOrder(Long id);
 
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..9c5e38f 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
diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustListInfoVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustListInfoVo.java
index a0e7396..18f2ae9 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustListInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/EntrustListInfoVo.java
@@ -38,6 +38,9 @@
     @ApiModelProperty(value = "上/下线 1-上线 2-下线")
     private Integer status;
 
+    @ApiModelProperty(value = "订单类型 B/购买 S/出售")
+    private String orderType;
+
     public BigDecimal getUnitPrice() {
         return unitPrice.setScale(2, BigDecimal.ROUND_DOWN);
     }

--
Gitblit v1.9.1