From 7f133cb8fc080b64ab8002b35f04b646f95a6abf Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 27 May 2021 16:37:38 +0800 Subject: [PATCH] Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc --- src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java index 7c05a68..1971a4d 100644 --- a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java +++ b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java @@ -11,6 +11,7 @@ import com.xcong.excoin.modules.otc.mapper.OtcMarketBussinessMapper; import com.xcong.excoin.modules.otc.service.OtcEntrustOrderService; import com.xcong.excoin.modules.otc.service.OtcMarketBussinessService; +import com.xcong.excoin.modules.otc.vo.ApplyConditionsVo; import com.xcong.excoin.modules.otc.vo.MarketBussinessInfoVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -35,11 +36,20 @@ private final MemberWalletCoinDao memberWalletCoinDao; private final MemberDao memberDao; + @ApiOperation(value = "申请条件", notes = "申请条件") + @ApiResponses({ + @ApiResponse(code = 200, message = "获取成功", response = ApplyConditionsVo.class) + }) + @PostMapping(value = "/applyConditions") + public Result applyConditions() { + return otcMarketBussinessService.applyConditions(); + } -// @ApiOperation(value = "applyMarketBussiness", notes = "申请市商接口") + + @ApiOperation(value = "申请市商接口", notes = "申请市商接口") @PostMapping(value = "/applyMaketBussiness") - public Result applyMarketBussiness(@RequestBody MbAddDto mbAddDto) { - otcMarketBussinessService.add(mbAddDto); + public Result applyMarketBussiness() { + otcMarketBussinessService.add(); return Result.ok("申请成功, 等待审核"); } @@ -66,7 +76,7 @@ return Result.ok("修改成功"); } -// @ApiOperation(value = "findMarketBussinessStatus", notes = "获取市商申请状态接口") + @ApiOperation(value = "findMarketBussinessStatus", notes = "获取市商申请状态接口") @GetMapping(value = "/findMarketBussinessStatus") public Result findMarketBussinessStatus() { return Result.ok("获取成功", otcMarketBussinessService.findMbStatus()); -- Gitblit v1.9.1