From 26043931d294d84ff7ef0305bf7879f74d70afdd Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 19 五月 2026 17:32:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0.1
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 110 +++++++++++++++++++++++++------------------------------
1 files changed, 50 insertions(+), 60 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 a8f1216..a7dfe70 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
@@ -941,19 +941,8 @@
@ApiOperation(value = "电站收入分析", tags = {"后台-数据分析-平台收入分析"})
public R<List<SixChargingDto>> charge(Integer siteId) {
Long userId = tokenService.getLoginUser().getUserid();
- //如果没传siteId,获取当前登陆人所有的siteIds
- List<Integer> siteIds = new ArrayList<>();
- if (siteId==null){
- List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
- for (GetSiteListDTO datum : data) {
- siteIds.add(datum.getId());
- }
- }else {
- siteIds.add(siteId);
- }
- if (siteIds.isEmpty()){
- siteIds.add(-1);
- }
+ SysUser sysUser = sysUserClient.getSysUser(userId).getData();
+ List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, siteId);
LocalDate sixBefore = PreviousSixMonths.get();
//通过siteIds进行sql查询统计
List<SixChargingDto> sixChargingDtos = generateLastSixMonths();
@@ -994,17 +983,9 @@
@ApiOperation(value = "电站收入占比", tags = {"后台-数据分析-平台收入分析"})
public R<List<SixCircleDto>> circle() {
Long userId = tokenService.getLoginUser().getUserid();
- //获取当前登录的siteIds
- List<Integer> siteIds = new ArrayList<>();
- List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
- for (GetSiteListDTO datum : data) {
- siteIds.add(datum.getId());
- }
- //进行统计groupBySiteId
+ SysUser sysUser = sysUserClient.getSysUser(userId).getData();
+ List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, null);
LocalDate sixBefore = PreviousSixMonths.get();
- if (siteIds.isEmpty()){
- siteIds.add(-1);
- }
List<SixCircleDto> sixCircleDtos = chargingOrderService.circle(siteIds,sixBefore);
for (SixCircleDto sixCircleDto : sixCircleDtos) {
Site site = siteClient.getSiteByIds(Arrays.asList(sixCircleDto.getSiteId())).getData().get(0);
@@ -1079,7 +1060,9 @@
-
+ /**
+ * 查询平台收入分析底部数据分类，充电订单金额由数据库聚合，避免全量订单和计费明细加载超时。
+ */
@RequiresPermissions(value = {"/platformRevenueAnalysis"}, logical = Logical.OR)
@ResponseBody
@GetMapping(value = "/six/total")
@@ -1088,18 +1071,10 @@
//count近6个月的数据
Long userId = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userId).getData();
- //获取当前登录的siteIds
- List<Integer> siteIds = new ArrayList<>();
- List<GetSiteListDTO> data9 = siteClient.getSiteListByUserId(userId).getData();
- for (GetSiteListDTO datum : data9) {
- siteIds.add(datum.getId());
- }
- //进行统计groupBySiteId
- if (siteIds.isEmpty()){
- siteIds.add(-1);
- }
+ List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, null);
Map<String,Object> map = chargingOrderService.countAll(siteIds);
- if(1 == sysUser.getObjectId()){
+ boolean platformVisible = 1 == sysUser.getObjectId();
+ if(platformVisible){
BigDecimal data = parkingLotClient.getRecordAmount().getData();
if (map ==null){
map = new HashMap<String,Object>();
@@ -1114,33 +1089,48 @@
map.put("shopAmount",0);
map.put("vipAmount",0);
}
- List<TChargingOrder> list = chargingOrderService.lambdaQuery().eq(TChargingOrder::getStatus, 5).eq(TChargingOrder::getDelFlag, 0)
- .eq(TChargingOrder::getRechargePaymentStatus, 2).in(TChargingOrder::getSiteId, siteIds).list();
- BigDecimal sharingAmount = BigDecimal.ZERO;
- BigDecimal commissionAmount = BigDecimal.ZERO;
- //计算list中electrovalence的总和
- BigDecimal totalElectrovalence = BigDecimal.ZERO;
- //计算list中serviceCharge的总和
- BigDecimal totalServiceCharge = BigDecimal.ZERO;
- List<TChargingOrderAccountingStrategy> accountingStrategyList = chargingOrderAccountingStrategyService.list();
- for (TChargingOrder order : list) {
- List<TChargingOrderAccountingStrategy> collect = accountingStrategyList.stream().filter(s -> s.getChargingOrderId().equals(order.getId())).collect(Collectors.toList());
- BigDecimal periodElectricPrice = collect.stream().map(TChargingOrderAccountingStrategy::getPeriodElectricPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal periodServicePrice = collect.stream().map(TChargingOrderAccountingStrategy::getPeriodServicePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
- totalElectrovalence = totalElectrovalence.add(periodElectricPrice);
- if(2 != order.getOrderSource()){
- totalServiceCharge = totalServiceCharge.add(periodServicePrice);
- commissionAmount = commissionAmount.add((periodElectricPrice.add(periodServicePrice)).multiply(new BigDecimal("0.006")));
- }else{
- totalServiceCharge = totalServiceCharge.add(periodServicePrice.multiply(new BigDecimal("0.8")));
- sharingAmount = sharingAmount.add(periodServicePrice.multiply(new BigDecimal("0.2")));
+ map.put("platformIncomeVisible", platformVisible);
+ return R.ok(map);
+ }
+
+ @RequiresPermissions(value = {"/platformRevenueAnalysis"}, logical = Logical.OR)
+ @ResponseBody
+ @GetMapping(value = "/six/pay-type-circle")
+ @ApiOperation(value = "收入类型占比", tags = {"后台-数据分析-平台收入分析"})
+ public R<List<SixIncomeCircleDto>> payTypeCircle() {
+ Long userId = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserClient.getSysUser(userId).getData();
+ List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, null);
+ LocalDate sixBefore = PreviousSixMonths.get();
+ return R.ok(chargingOrderService.payTypeCircle(sixBefore, siteIds));
+ }
+
+ /**
+ * 解析平台收入分析页面允许查看的站点范围。
+ * 合作商使用授权站点，其他后台账号沿用用户站点列表；传入站点时需做授权校验。
+ */
+ private List<Integer> resolvePlatformRevenueSiteIds(Long userId, SysUser sysUser, Integer siteId) {
+ List<Integer> siteIds = new ArrayList<>();
+ if (sysUser != null && Integer.valueOf(2).equals(sysUser.getRoleType())) {
+ Set<Integer> authSiteIds = partnerClient.authSite(sysUser.getObjectId(), SiteMenu.SITE_LIST.getValue()).getData();
+ if (authSiteIds != null) {
+ siteIds.addAll(authSiteIds);
+ }
+ } else {
+ List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
+ if (data != null) {
+ for (GetSiteListDTO datum : data) {
+ siteIds.add(datum.getId());
+ }
}
}
- map.put("service_charge",totalServiceCharge.setScale(2, BigDecimal.ROUND_HALF_EVEN));
- map.put("electrovalence",totalElectrovalence.setScale(2, BigDecimal.ROUND_HALF_EVEN));
- map.put("commission_amount",commissionAmount.setScale(2, BigDecimal.ROUND_HALF_EVEN));
- map.put("sharing_amount",sharingAmount.setScale(2, BigDecimal.ROUND_HALF_EVEN));
- return R.ok(map);
+ if (siteId != null) {
+ return siteIds.contains(siteId) ? Collections.singletonList(siteId) : Collections.singletonList(-1);
+ }
+ if (siteIds.isEmpty()) {
+ siteIds.add(-1);
+ }
+ return siteIds;
}
--
Gitblit v1.7.1