From 7cd5e4d9e5450aaf5617a1e69c14ceefb55c011b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 24 Nov 2022 10:47:50 +0800
Subject: [PATCH] 20221117 挂机极差，以自己的等级为基准
---
src/main/java/cc/mrbird/febs/dapp/controller/MemberMoneyFlowController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 bc978d1..ccdabaf 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/MemberMoneyFlowController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/MemberMoneyFlowController.java
@@ -3,9 +3,12 @@
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 cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
@@ -15,7 +18,7 @@
import org.springframework.web.bind.annotation.RestController;
/**
- * @author wzy
+ * @author
* @date 2022-03-22
**/
@Slf4j
@@ -29,6 +32,10 @@
@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)));
}
@@ -46,6 +53,19 @@
@RequestMapping(value = "accountMoneyChangeFlow")
public FebsResponse accountMoneyChangeFlow(DappAccountMoneyChangeEntity record, QueryRequest request) {
+ User currentUser = FebsUtil.getCurrentUser();
+ if(ObjectUtil.isNotEmpty(currentUser.getDescription())){
+ record.setDescription(currentUser.getDescription());
+ }
return new FebsResponse().success().data(getDataTable(dappWalletService.accountMoneyChangeInPage(record, request)));
}
+
+ @RequestMapping(value = "moneyTotal")
+ public FebsResponse moneyTotal(DappAccountMoneyChangeEntity record, QueryRequest request) {
+ User currentUser = FebsUtil.getCurrentUser();
+ if(ObjectUtil.isNotEmpty(currentUser.getDescription())){
+ record.setDescription(currentUser.getDescription());
+ }
+ return new FebsResponse().success().data(getDataTable(dappWalletService.moneyTotal(record, request)));
+ }
}
--
Gitblit v1.9.1