From dca3e301410be4aee5a7895a1c2c1bbf90f3d03b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 16 Mar 2022 15:21:36 +0800
Subject: [PATCH] 20222223

---
 src/main/java/com/xcong/excoin/modules/otc/controller/OtcEntrustOrderController.java |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 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..324e1ba 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
@@ -5,9 +5,11 @@
 import com.xcong.excoin.common.LoginUserUtils;
 import com.xcong.excoin.common.response.Result;
 import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.otc.dao.OtcSettingDao;
 import com.xcong.excoin.modules.otc.dto.EntrustOrderAddDto;
 import com.xcong.excoin.modules.otc.dto.EntrustOrderListDto;
 import com.xcong.excoin.modules.otc.entity.OtcEntrustOrder;
+import com.xcong.excoin.modules.otc.entity.OtcSetting;
 import com.xcong.excoin.modules.otc.service.OtcEntrustOrderService;
 import com.xcong.excoin.modules.otc.vo.EntrustListInfoVo;
 import com.xcong.excoin.modules.otc.vo.EntrustListVo;
@@ -33,12 +35,23 @@
 public class OtcEntrustOrderController {
 
     private final OtcEntrustOrderService otcEntrustOrderService;
+    private final OtcSettingDao otcSettingDao;
 
     @ApiOperation(value = "添加otc委托单", notes = "添加otc委托单")
     @PostMapping(value = "/addEntrustOrder")
     public Result addEntrustOrder(@RequestBody EntrustOrderAddDto addDto) {
         otcEntrustOrderService.add(addDto);
         return Result.ok("添加成功");
+    }
+
+    @ApiOperation(value = "获取市商条件")
+    @ApiResponses({
+            @ApiResponse(code  = 200, message = "success", response = OtcSetting.class)
+    })
+    @GetMapping(value = "/findCondition")
+    public Result findCondition() {
+        OtcSetting setting = otcSettingDao.selectById(1L);
+        return Result.ok(setting);
     }
 
     @ApiOperation(value = "编辑otc委托单", notes = "编辑otc委托单")
@@ -62,9 +75,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 = "获取我的委托单详情")

--
Gitblit v1.9.1