From c881dcbb782d209f43b9a2878de613e0124e0421 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sun, 07 Jul 2024 12:53:00 +0800
Subject: [PATCH] 逻辑
---
src/main/java/cc/mrbird/febs/dapp/controller/MemberMoneyFlowController.java | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/MemberMoneyFlowController.java b/src/main/java/cc/mrbird/febs/dapp/controller/MemberMoneyFlowController.java
index d810441..af43dbd 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/MemberMoneyFlowController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/MemberMoneyFlowController.java
@@ -1,10 +1,14 @@
package cc.mrbird.febs.dapp.controller;
+import cc.mrbird.febs.common.annotation.ControllerEndpoint;
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.common.utils.FebsUtil;
+import cc.mrbird.febs.dapp.entity.DappAccountMoneyChangeEntity;
import cc.mrbird.febs.dapp.entity.DappFundFlowEntity;
import cc.mrbird.febs.dapp.service.DappWalletService;
+import cc.mrbird.febs.system.entity.User;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
@@ -13,8 +17,10 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.validation.constraints.NotNull;
+
/**
- * @author wzy
+ * @author
* @date 2022-03-22
**/
@Slf4j
@@ -28,18 +34,33 @@
@RequestMapping(value = "/fundFlow")
public FebsResponse fundFlow(DappFundFlowEntity dappFundFlowEntity, QueryRequest request) {
+ User currentUser = FebsUtil.getCurrentUser();
+ if (currentUser.getDeptId() == null) {
+ dappFundFlowEntity.setCurrentUser(currentUser.getUserId());
+ }
return new FebsResponse().success().data(getDataTable(dappWalletService.fundFlowInPage(dappFundFlowEntity, request)));
}
- @PostMapping(value = "/withdrawAgree/{id}")
- public FebsResponse withdrawAgree(@PathVariable("id") Long id) {
- dappWalletService.withdrawAgreeOrNot(id, 1);
- return new FebsResponse().success();
+ @RequestMapping(value = "accountMoneyChangeFlow")
+ public FebsResponse accountMoneyChangeFlow(DappAccountMoneyChangeEntity record, QueryRequest request) {
+ return new FebsResponse().success().data(getDataTable(dappWalletService.accountMoneyChangeInPage(record, request)));
}
- @PostMapping(value = "/withdrawDisAgree/{id}")
- public FebsResponse withdrawDisAgree(@PathVariable("id") Long id) {
- dappWalletService.withdrawAgreeOrNot(id, 2);
- return new FebsResponse().success();
+ /**
+ * 提现转账列表-同意
+ */
+ @PostMapping("withdrawAgree/{id}")
+ @ControllerEndpoint(operation = "提现转账列表-同意", exceptionMessage = "操作失败")
+ public FebsResponse agreeWithdraw(@NotNull(message = "{required}") @PathVariable Long id) {
+ return dappWalletService.agreeWithdraw(id);
+ }
+
+ /**
+ * 提现转账列表-拒绝
+ */
+ @PostMapping("withdrawDisAgree/{id}")
+ @ControllerEndpoint(operation = "提现转账列表-拒绝", exceptionMessage = "操作失败")
+ public FebsResponse disagreeWithdraw(@NotNull(message = "{required}") @PathVariable Long id) {
+ return dappWalletService.disagreeWithdraw(id);
}
}
--
Gitblit v1.9.1