From 7d4a3540e69565152d77cc1e4c9cc5b98df52871 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Fri, 11 Aug 2023 17:02:07 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=BB=9F=E8=AE=A1=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OrderBasicInfoServiceImpl.java       | 16 +++++++++-
 jsowell-ui/src/views/order/order/index.vue    | 30 ++++++++-----------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index 6d642d09d..bc5d9c6ed 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -371,11 +371,25 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
      */
     @Override
     public OrderTotalDataVO getOrderTotalDataV2(QueryOrderDTO dto) {
+        // 确定查询的站点
+        List<String> stationIdList = Lists.newArrayList();
+        if (StringUtils.isNotBlank(dto.getStationId())) {
+            stationIdList.add(dto.getStationId());
+        }
+        if (StringUtils.isNotBlank(dto.getMerchantId())) {
+            List<PileStationInfo> pileStationInfos = pileStationInfoService.selectStationListByMerchantId(Long.parseLong(dto.getMerchantId()));
+            if (CollectionUtils.isNotEmpty(pileStationInfos)) {
+                List<String> collect = pileStationInfos.stream()
+                        .map(x -> String.valueOf(x.getId()))
+                        .collect(Collectors.toList());
+                stationIdList.addAll(collect);
+            }
+        }
+
         OrderTotalDataVO vo = new OrderTotalDataVO();
         String startTime = dto.getStartTime();
         String endTime = dto.getEndTime();
         vo.setDateDescription(startTime + " - " + endTime);
-        List<String> stationIdList = Lists.newArrayList(dto.getStationId());
         List<SettleOrderReport> settleOrderReports = settleOrderReportService.queryOrderReport(stationIdList, startTime, endTime);
         // 总消费金额
         BigDecimal sumOrderAmount = BigDecimal.ZERO;
diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue
index bdda3e9f4..251a04a2c 100644
--- a/jsowell-ui/src/views/order/order/index.vue
+++ b/jsowell-ui/src/views/order/order/index.vue
@@ -140,11 +140,9 @@
                 v-hasPermi="['order:order:export']"
                 >导出
             </el-button>
-            <!--            <div>
-                {{ dateDescription }}期间，总用电量{{ sumUsedElectricity }}度，总消费金额{{
-                    sumOrderAmount
-                }}元，总结算金额{{ sumSettleAmount }}元
-            </div>-->
+            <div>
+                {{ dateDescription }}期间，总用电量{{ sumUsedElectricity }}度，总消费金额{{ sumOrderAmount }}元，总结算金额{{ sumSettleAmount }}元
+            </div>
             <el-popover placement="top-start" width="400" trigger="click">
                 <el-checkbox
                     :indeterminate="isIndeterminate"
@@ -468,12 +466,10 @@ export default {
             console.log("加载订单列表页数据...");
             // 设置默认日期
             await this.defaultDate();
-            // 查询订单列表
-            this.getList();
             // 查询站点列表
             this.getStationList();
-            // 获取订单总金额
-            // this.getOrderTotalData();
+            // 查询数据
+            this.handleQuery();
         },
         /** 查询订单列表 */
         getList() {
@@ -487,13 +483,13 @@ export default {
         },
         // 获取订单总金额数据
         getOrderTotalData() {
-            // totalData(this.queryParams).then((response) => {
-            //     console.log("getOrderTotalData", response);
-            //     this.dateDescription = response.data.dateDescription;
-            //     this.sumOrderAmount = response.data.sumOrderAmount;
-            //     this.sumUsedElectricity = response.data.sumUsedElectricity;
-            //     this.sumSettleAmount = response.data.sumSettleAmount;
-            // });
+            totalData(this.queryParams).then((response) => {
+                console.log("getOrderTotalData", response);
+                this.dateDescription = response.data.dateDescription;
+                this.sumOrderAmount = response.data.sumOrderAmount;
+                this.sumUsedElectricity = response.data.sumUsedElectricity;
+                this.sumSettleAmount = response.data.sumSettleAmount;
+            });
         },
         // 取消按钮
         cancel() {
@@ -534,7 +530,7 @@ export default {
             // 获取订单列表
             this.getList();
             // 获取订单总金额
-            // this.getOrderTotalData();
+            this.getOrderTotalData();
         },
         /** 重置按钮操作 */
         resetQuery() {