From 8b7e2c47b56bfe506ffd32b4f6268c5525248d7f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 08 Dec 2022 17:37:11 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java | 77 ++++++++++++++++++++++++++++++++++++--
1 files changed, 73 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
index 22e5a88..ea1871a 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -3,6 +3,7 @@
import cc.mrbird.febs.common.annotation.EncryptEnable;
import cc.mrbird.febs.common.configure.i18n.MessageSourceUtils;
import cc.mrbird.febs.common.contants.AppContants;
+import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.RedisUtils;
@@ -12,6 +13,8 @@
import cc.mrbird.febs.dapp.service.DappSystemService;
import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.dapp.vo.*;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -21,6 +24,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.Map;
/**
* @author
@@ -33,7 +37,7 @@
@RestController
@Api(value = "dapp接口", tags = "dapp接口")
@RequestMapping(value = "/dapi/member")
-public class ApiDappMemberController {
+public class ApiDappMemberController extends BaseController {
private final DappWalletService dappWalletService;
private final DappSystemService dappSystemService;
@@ -123,7 +127,15 @@
@PostMapping(value = "/logOut")
public FebsResponse logout() {
DappMemberEntity member = LoginUserUtil.getAppUser();
+
String redisKey = AppContants.REDIS_KEY_SIGN + member.getId();
+ String existToken = redisUtils.getString(redisKey);
+ if (StrUtil.isNotBlank(existToken)) {
+ Object o = redisUtils.get(existToken);
+ if (ObjectUtil.isNotEmpty(o)) {
+ redisUtils.del(existToken);
+ }
+ }
redisUtils.del(redisKey);
return new FebsResponse().success();
}
@@ -153,7 +165,8 @@
})
@PostMapping(value = "/findAmountInPage")
public FebsResponse findAmountInPage(@RequestBody ApiAmountChangeDto apiAmountChangeDto) {
- return new FebsResponse().success().data(dappMemberService.findAmountInPage(apiAmountChangeDto));
+ Map<String, Object> data = getDataTable(dappMemberService.findAmountInPage(apiAmountChangeDto));
+ return new FebsResponse().success().data(data);
}
@ApiOperation(value ="IGT我的团队-新增团队成员", notes = "我的团队-新增团队成员")
@@ -168,7 +181,9 @@
})
@PostMapping(value = "/myTeammateInfo")
public FebsResponse myTeammateInfo(@RequestBody ApiMyTeammateInfoDto apiMyTeammateInfoDto) {
- return dappMemberService.myTeammateInfo(apiMyTeammateInfoDto);
+
+ Map<String, Object> data = getDataTable(dappMemberService.myTeammateInfo(apiMyTeammateInfoDto));
+ return new FebsResponse().success().data(data);
}
@ApiOperation(value ="IGT我的团队-资金记录-分页", notes = "我的团队-资金记录-分页")
@@ -177,7 +192,8 @@
})
@PostMapping(value = "/teammateChangeListInPage")
public FebsResponse teammateChangeListInPage(@RequestBody ApiAmountChangeDto apiAmountChangeDto) {
- return dappMemberService.findTeammateChangeListInPage(apiAmountChangeDto);
+ Map<String, Object> data = getDataTable(dappMemberService.findTeammateChangeListInPage(apiAmountChangeDto));
+ return new FebsResponse().success().data(data);
}
@ApiOperation(value = "IGT更新登录密码", notes = "更新登录密码")
@@ -185,4 +201,57 @@
public FebsResponse updatePassword(@RequestBody ApiUpdatePasswordDto apiUpdatePasswordDto) {
return dappWalletService.updatePassword(apiUpdatePasswordDto);
}
+
+ @ApiOperation(value = "IGT重置登录密码", notes = "重置登录密码")
+ @PostMapping(value = "/resetPassword")
+ public FebsResponse resetPassword(@RequestBody ApiResetPasswordDto apiResetPasswordDto) {
+ return dappWalletService.resetPassword(apiResetPasswordDto);
+ }
+
+ @ApiOperation(value ="IGT银行卡-列表分页", notes = "银行卡-列表分页")
+ @ApiResponses(value = {
+ @ApiResponse(code = 200, message = "success", response = ApiBankListVo.class)
+ })
+ @PostMapping(value = "/bankList")
+ public FebsResponse bankList(@RequestBody ApiBankListDto apiBankListDto) {
+// Map<String, Object> data = getDataTable(dappMemberService.getBankListInPage(apiBankListDto));
+ return dappMemberService.getBankListInPage(apiBankListDto);
+ }
+
+ @ApiOperation(value ="IGT银行卡-新增", notes = "银行卡-新增")
+ @PostMapping(value = "/addBank")
+ public FebsResponse addBank(@RequestBody ApiAddBankDto addBankDto) {
+ return dappMemberService.addBank(addBankDto);
+ }
+
+ @ApiOperation(value ="IGT我的钱包", notes = "我的钱包")
+ @ApiResponses(value = {
+ @ApiResponse(code = 200, message = "success", response = ApiAddressInfoVo.class)
+ })
+ @PostMapping(value = "/myAddress")
+ public FebsResponse myAddress() {
+ return dappMemberService.getBankListInPage();
+ }
+
+ @ApiOperation(value ="IGT我的钱包-新增", notes = "我的钱包-新增")
+ @PostMapping(value = "/addAddress")
+ public FebsResponse addAddress(@RequestBody ApiAddAddressDto apiAddAddressDto) {
+ return dappMemberService.addAddress(apiAddAddressDto);
+ }
+
+ @ApiOperation(value = "IGT发送客服消息", notes = "发送客服消息")
+ @PostMapping(value = "/addMessage")
+ public FebsResponse addMessage(@RequestBody AddMessageDto addMessageDto) {
+ return dappMemberService.addMessage(addMessageDto);
+ }
+
+ @ApiOperation(value ="IGT客服消息-列表分页", notes = "客服消息-列表分页")
+ @ApiResponses(value = {
+ @ApiResponse(code = 200, message = "success", response = ApiMessageListVo.class)
+ })
+ @PostMapping(value = "/messageList")
+ public FebsResponse messageList(@RequestBody ApiMessageListDto apiMessageListDto) {
+ Map<String, Object> data = getDataTable(dappMemberService.getMessageListInPage(apiMessageListDto));
+ return new FebsResponse().success().data(data);
+ }
}
--
Gitblit v1.9.1