From 420efcecbc5b9b17f96b9c0a37d9bc3a5f1afccd Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 06 Nov 2022 17:46:01 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/controller/MemberMoneyFlowController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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..5d085b1 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/MemberMoneyFlowController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/MemberMoneyFlowController.java
@@ -3,8 +3,11 @@
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;
@@ -14,7 +17,7 @@
import org.springframework.web.bind.annotation.RestController;
/**
- * @author wzy
+ * @author
* @date 2022-03-22
**/
@Slf4j
@@ -28,18 +31,15 @@
@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();
- }
-
- @PostMapping(value = "/withdrawDisAgree/{id}")
- public FebsResponse withdrawDisAgree(@PathVariable("id") Long id) {
- dappWalletService.withdrawAgreeOrNot(id, 2);
- return new FebsResponse().success();
+ @RequestMapping(value = "accountMoneyChangeFlow")
+ public FebsResponse accountMoneyChangeFlow(DappAccountMoneyChangeEntity record, QueryRequest request) {
+ return new FebsResponse().success().data(getDataTable(dappWalletService.accountMoneyChangeInPage(record, request)));
}
}
--
Gitblit v1.9.1