From 6bebf72db1ec82ce983575d51e0ac2aedcea90c6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 May 2021 15:15:24 +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 | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 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 b4a41ea..372d83a 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
@@ -2,7 +2,10 @@
import com.xcong.excoin.common.LoginUserUtils;
import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.modules.member.dao.MemberDao;
+import com.xcong.excoin.modules.member.dao.MemberWalletCoinDao;
import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.member.entity.MemberWalletCoinEntity;
import com.xcong.excoin.modules.otc.dto.MbAddDto;
import com.xcong.excoin.modules.otc.entity.OtcMarketBussiness;
import com.xcong.excoin.modules.otc.mapper.OtcMarketBussinessMapper;
@@ -29,17 +32,18 @@
public class OtcMarketBussinessController {
private final OtcMarketBussinessService otcMarketBussinessService;
- private final OtcEntrustOrderService otcEntrustOrderService;
+ private final MemberWalletCoinDao memberWalletCoinDao;
+ private final MemberDao memberDao;
- @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("申请成功, 等待审核");
}
- @ApiOperation(value = "modifyMarketBussiness", notes = "修改个人信息")
+// @ApiOperation(value = "modifyMarketBussiness", notes = "修改个人信息")
@PostMapping(value = "/modifyMarketBussiness")
public Result modifyMarketBussiness(@RequestBody MbAddDto mbAddDto) {
if (mbAddDto.getId() == null) {
@@ -57,7 +61,7 @@
OtcMarketBussiness otcMb = new OtcMarketBussiness();
otcMb.setId(mbAddDto.getId());
- otcMb.setNikename(mbAddDto.getNickname());
+// otcMb.setNikename(mbAddDto.getNickname());
otcMarketBussinessService.updateById(otcMb);
return Result.ok("修改成功");
}
@@ -68,7 +72,8 @@
return Result.ok("获取成功", otcMarketBussinessService.findMbStatus());
}
- @ApiOperation(value = "findMbInfo", notes = "获取市商信息")
+
+ @ApiOperation(value = "获取市商信息", notes = "获取市商信息")
@ApiResponses({
@ApiResponse(code = 200, message = "获取成功", response = MarketBussinessInfoVo.class)
})
@@ -77,4 +82,26 @@
return this.otcMarketBussinessService.findMbInfo(id);
}
+ @ApiOperation(value = "修改姓名")
+ @PostMapping(value = "/modifyName")
+ public Result modifyName(@RequestBody MbAddDto mbAddDto) {
+ MemberEntity member = LoginUserUtils.getAppLoginUser();
+ Long memberId = member.getId();
+
+ member = new MemberEntity();
+ member.setId(memberId);
+// member.setName(mbAddDto.getNickname());
+ memberDao.updateById(member);
+
+ return Result.ok("修改成功");
+ }
+
+ @ApiOperation(value = "查询当前用户可用")
+ @GetMapping(value = "/memberWallet")
+ public Result memberWallet() {
+ MemberEntity member = LoginUserUtils.getAppLoginUser();
+ MemberWalletCoinEntity wallet = memberWalletCoinDao.selectWalletCoinBymIdAndCode(member.getId(), "USDT");
+ return Result.ok(wallet.getAvailableBalance());
+ }
+
}
--
Gitblit v1.9.1