From 9af9ab4d7a638687024437a9e1d1e742fe1b4bb2 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sat, 11 May 2024 10:49:54 +0800
Subject: [PATCH] 香港新环境
---
src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java | 105 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 73 insertions(+), 32 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
index b0881a1..125465a 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
@@ -8,12 +8,11 @@
import cc.mrbird.febs.dapp.entity.DappSystemProfit;
import cc.mrbird.febs.dapp.entity.DataDictionaryCustom;
import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
-import cc.mrbird.febs.dapp.mapper.DappMemberDao;
-import cc.mrbird.febs.dapp.mapper.DappSystemProfitDao;
-import cc.mrbird.febs.dapp.mapper.DataDictionaryCustomMapper;
+import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappMemberService;
import cc.mrbird.febs.dapp.vo.AdminAgentLevelSetInfoVo;
import cc.mrbird.febs.dapp.vo.AdminSystemFeeVo;
+import cc.mrbird.febs.dapp.vo.DappMemberInfoVo;
import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -39,6 +38,8 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final DappSystemProfitDao dappSystemProfitDao;
private final DappMemberDao dappMemberDao;
+ private final DappWalletCoinDao dappWalletCoinDao;
+ private final DappWalletMineDao dappWalletMineDao;
@GetMapping(value = "admin")
@RequiresPermissions("admin:view")
@@ -82,6 +83,12 @@
@RequiresPermissions("withdraw:view")
public String memberWithdraw() {
return FebsUtil.view("dapp/member-withdraw");
+ }
+
+ @GetMapping("memberCharge")
+ @RequiresPermissions("charge:view")
+ public String memberCharge() {
+ return FebsUtil.view("dapp/member-charge");
}
@GetMapping("walletCoin")
@@ -135,35 +142,35 @@
@RequiresPermissions("fee:setting:view")
public String systemFeeSet(Model model) {
AdminSystemFeeVo adminSystemFeeVo = new AdminSystemFeeVo();
- DataDictionaryCustom rebateDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.REBATE_PERCENT.getType(), DataDictionaryEnum.REBATE_PERCENT.getCode());
- if (ObjectUtil.isNotEmpty(rebateDic)) {
- String value = rebateDic.getValue() == null ? "0" : rebateDic.getValue();
- adminSystemFeeVo.setRebatePercent(value);
- }
- DataDictionaryCustom memberFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MEMBER_FEE.getType(), DataDictionaryEnum.MEMBER_FEE.getCode());
- if (ObjectUtil.isNotEmpty(memberFeeDic)) {
- String value = memberFeeDic.getValue() == null ? "0" : memberFeeDic.getValue();
- adminSystemFeeVo.setMemberFee(value);
- }
- DataDictionaryCustom serviceFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WITHDRAW_SERVICE_FEE.getType(), DataDictionaryEnum.WITHDRAW_SERVICE_FEE.getCode());
- if (ObjectUtil.isNotEmpty(serviceFeeDic)) {
- String value = serviceFeeDic.getValue() == null ? "0" : serviceFeeDic.getValue();
- adminSystemFeeVo.setServiceFee(value);
- }
-
- DataDictionaryCustom symbolPrice = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYMBOL_PRICE.getType(), DataDictionaryEnum.SYMBOL_PRICE.getCode());
- if (ObjectUtil.isNotEmpty(symbolPrice)) {
- String value = symbolPrice.getValue() == null ? "0" : symbolPrice.getValue();
- adminSystemFeeVo.setSymbolPrice(value);
- }
-
- DataDictionaryCustom directProfitDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- DataDictionaryEnum.DIRECT_PROFIT.getType(), DataDictionaryEnum.DIRECT_PROFIT.getCode());
- if (ObjectUtil.isNotEmpty(directProfitDic)) {
- String value = directProfitDic.getValue() == null ? "0" : directProfitDic.getValue();
- adminSystemFeeVo.setDirectProfit(value);
- }
- model.addAttribute("systemFee", adminSystemFeeVo);
+// DataDictionaryCustom rebateDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.REBATE_PERCENT.getType(), DataDictionaryEnum.REBATE_PERCENT.getCode());
+// if (ObjectUtil.isNotEmpty(rebateDic)) {
+// String value = rebateDic.getValue() == null ? "0" : rebateDic.getValue();
+// adminSystemFeeVo.setRebatePercent(value);
+// }
+// DataDictionaryCustom memberFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MEMBER_FEE.getType(), DataDictionaryEnum.MEMBER_FEE.getCode());
+// if (ObjectUtil.isNotEmpty(memberFeeDic)) {
+// String value = memberFeeDic.getValue() == null ? "0" : memberFeeDic.getValue();
+// adminSystemFeeVo.setMemberFee(value);
+// }
+// DataDictionaryCustom serviceFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WITHDRAW_SERVICE_FEE.getType(), DataDictionaryEnum.WITHDRAW_SERVICE_FEE.getCode());
+// if (ObjectUtil.isNotEmpty(serviceFeeDic)) {
+// String value = serviceFeeDic.getValue() == null ? "0" : serviceFeeDic.getValue();
+// adminSystemFeeVo.setServiceFee(value);
+// }
+//
+// DataDictionaryCustom symbolPrice = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYMBOL_PRICE.getType(), DataDictionaryEnum.SYMBOL_PRICE.getCode());
+// if (ObjectUtil.isNotEmpty(symbolPrice)) {
+// String value = symbolPrice.getValue() == null ? "0" : symbolPrice.getValue();
+// adminSystemFeeVo.setSymbolPrice(value);
+// }
+//
+// DataDictionaryCustom directProfitDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+// DataDictionaryEnum.DIRECT_PROFIT.getType(), DataDictionaryEnum.DIRECT_PROFIT.getCode());
+// if (ObjectUtil.isNotEmpty(directProfitDic)) {
+// String value = directProfitDic.getValue() == null ? "0" : directProfitDic.getValue();
+// adminSystemFeeVo.setDirectProfit(value);
+// }
+// model.addAttribute("systemFee", adminSystemFeeVo);
return FebsUtil.view("dapp/system-fee-set");
}
@@ -238,4 +245,38 @@
model.addAttribute("agentLevelSet", data);
return FebsUtil.view("dapp/member-agent-level");
}
+
+
+ /**
+ * 拨付
+ * @return
+ */
+ @GetMapping("mallSystemPay/{type}/{id}")
+ @RequiresPermissions("agentLevel:view")
+ public String systemPay(@PathVariable long id, @PathVariable Integer type, Model model) {
+ DappMemberInfoVo data = dappMemberDao.selectDappMemberInfoVoByMemberId(id);
+ model.addAttribute("systemPay", data);
+ model.addAttribute("type", type);
+ return FebsUtil.view("dapp/mallSystemPay");
+ }
+
+ /**
+ * 个人-资金流水
+ * @param id
+ * @param model
+ * @return
+ */
+ public static long idMemberMoneyFlow;
+ @GetMapping("memberFlow/{id}")
+ @RequiresPermissions("agentLevel:view")
+ public String memberFlow(@PathVariable long id, Model model) {
+ idMemberMoneyFlow = id;
+ return FebsUtil.view("dapp/memberMoneyFlow");
+ }
+
+ @GetMapping("soccerLeagues")
+ @RequiresPermissions("soccerLeagues:view")
+ public String soccerLeagues() {
+ return FebsUtil.view("dapp/soccerLeagues");
+ }
}
--
Gitblit v1.9.1