首页趋势图展示查询范围类总电量和总服务费

service/src/main/java/com/kym/service/miniapp/ChargeOrderService.java

@@ -1,5 +1,6 @@
 package com.kym.service.miniapp;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kym.entity.admin.queryParams.CustomChargeOrdersQueryParam;
 import com.kym.entity.admin.queryParams.StatQueryParam;
@@ -31,7 +32,7 @@ public interface ChargeOrderService extends IService<ChargeOrder> {
 
     ChargeOrder orderDetailForApp(String startChargeSeq);
 
-    PageBean<StationStatVo> stationStat(StatQueryParam params);
+    JSONObject stationStat(StatQueryParam params);
 
     Map stationTodayStat();
 }

service/src/main/java/com/kym/service/miniapp/impl/ChargeOrderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.kym.service.miniapp.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
@@ -86,7 +87,7 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
      * @return
      */
     @Override
-    public PageBean<StationStatVo> stationStat(StatQueryParam params) {
+    public JSONObject stationStat(StatQueryParam params) {
         // 判断数据权限
         params.setStationId(kymCache.getAdminUserStationId(StpUtil.getLoginIdAsLong()));
         PageHelper.startPage(params.getPageNum(), params.getPageSize());
@@ -94,7 +95,9 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
             item.setElecMoneyPercent((new BigDecimal(item.getElecMoney())).divide(new BigDecimal(Math.max(1, item.getTotalMoney())), 2, RoundingMode.HALF_UP));
             item.setServiceMoneyPercent(BigDecimal.ONE.subtract(item.getElecMoneyPercent()));
         }).collect(Collectors.toList());
-        return new PageBean<>(res);
+        return JSONObject.parseObject(JSONObject.toJSONString(new PageBean<>(res)))
+                .fluentPut("totalPower", res.stream().mapToDouble(StationStatVo::getTotalPower).sum())
+                .fluentPut("serviceMoney", res.stream().mapToInt(StationStatVo::getServiceMoney).sum());
     }
 
     /**