From 753c4aede53b07041841d9aa94859b59e366bd5d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 14 八月 2023 18:47:39 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
index 42b93e5..0a7ac7e 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
@@ -89,6 +89,9 @@
@Autowired
private IRechargeRecordService rechargeRecordService;
+ @Autowired
+ private ITSystemConfigService systemConfigService;
+
@Value("${callbackPath}")
private String callbackPath;
@@ -782,7 +785,8 @@
JSONObject jsonObject = JSON.parseObject(execute.getResult());
model.addAttribute("balance", jsonObject.getDoubleValue("settledAmount") / 100);
if(roleType == 1){
- model.addAttribute("marketingAmount", jsonObject.getDoubleValue("marketingAmount") / 100);
+ Double amount = rechargeRecordService.querSumSurplusDividedAmount(4);
+ model.addAttribute("marketingAmount", amount);
}
}
return PREFIX + "enterprisePage.html";
--
Gitblit v1.7.1