From 971c4c311f4442400a90b966428d50b4131f17ff Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期一, 20 七月 2026 23:01:43 +0800
Subject: [PATCH] fix: 支持平台收入按电站筛选
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index ac9be1d..067b852 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -1271,11 +1271,11 @@
@ResponseBody
@GetMapping(value = "/six/circle")
@ApiOperation(value = "电站收入占比", tags = {"后台-数据分析-平台收入分析"})
- public R<List<SixCircleDto>> circle() {
+ public R<List<SixCircleDto>> circle(Integer siteId) {
Long userId = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userId).getData();
boolean partnerView = isPartnerView(sysUser);
- List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, null);
+ List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, siteId);
LocalDate sixBefore = PreviousSixMonths.get();
List<SixCircleDto> sixCircleDtos = chargingOrderService.circle(siteIds,sixBefore, partnerView);
for (SixCircleDto sixCircleDto : sixCircleDtos) {
@@ -1358,12 +1358,12 @@
@ResponseBody
@GetMapping(value = "/six/total")
@ApiOperation(value = "底部数据分类", tags = {"后台-数据分析-平台收入分析"})
- public R<Map<String,Object>> total() {
+ public R<Map<String,Object>> total(Integer siteId) {
//count近6个月的数据
Long userId = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userId).getData();
boolean partnerView = isPartnerView(sysUser);
- List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, null);
+ List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, siteId);
Map<String,Object> map = chargingOrderService.countAll(siteIds, partnerView);
if (map == null) {
map = new HashMap<String,Object>();
@@ -1389,11 +1389,11 @@
@ResponseBody
@GetMapping(value = "/six/pay-type-circle")
@ApiOperation(value = "收入类型占比", tags = {"后台-数据分析-平台收入分析"})
- public R<List<SixIncomeCircleDto>> payTypeCircle() {
+ public R<List<SixIncomeCircleDto>> payTypeCircle(Integer siteId) {
Long userId = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userId).getData();
boolean partnerView = isPartnerView(sysUser);
- List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, null);
+ List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, siteId);
LocalDate sixBefore = PreviousSixMonths.get();
return R.ok(chargingOrderService.payTypeCircle(sixBefore, siteIds, partnerView));
}
--
Gitblit v1.7.1