From c1023206d3207bf9520e99c2f0f4549d8eb61ddc Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 26 十月 2024 16:28:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml | 8 ++++----
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/CarUtil.java | 26 +++++++++++++-------------
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 2 +-
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/CarUtil.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/CarUtil.java
index 8087a9e..2ac66fd 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/CarUtil.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/CarUtil.java
@@ -877,91 +877,91 @@
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110000\"\n" +
+ " \"AreaCode\": \"110110\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京B\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110000\"\n" +
+ " \"AreaCode\": \"110110\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京C\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110000\"\n" +
+ " \"AreaCode\": \"110110\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京D\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110000\"\n" +
+ " \"AreaCode\": \"110110\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京E\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110000\"\n" +
+ " \"AreaCode\": \"110110\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京F\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110000\"\n" +
+ " \"AreaCode\": \"110110\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京G\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110000\"\n" +
+ " \"AreaCode\": \"110110\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京H\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110000\"\n" +
+ " \"AreaCode\": \"110110\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京J\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110000\"\n" +
+ " \"AreaCode\": \"110110\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京K\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110000\"\n" +
+ " \"AreaCode\": \"110110\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京L\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110000\"\n" +
+ " \"AreaCode\": \"110110\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京M\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110000\"\n" +
+ " \"AreaCode\": \"110110\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京Y\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110000\"\n" +
+ " \"AreaCode\": \"110110\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"豫A\",\n" +
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml
index a4e5734..1553995 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml
@@ -88,10 +88,10 @@
<select id="getStatusModeStatistics" resultType="com.ruoyi.chargingPile.api.vo.StatusModeStatisticsVO">
SELECT
charge_mode,
- IFNULL((SELECT COUNT(*) FROM t_charging_gun WHERE status = 2 AND charge_mode = #{chargeMode}),0) AS freeCount,
- IFNULL((SELECT COUNT(*) FROM t_charging_gun WHERE status = 5 AND charge_mode = #{chargeMode}),0) AS filledCount,
- IFNULL((SELECT COUNT(*) FROM t_charging_gun WHERE status = 3 AND charge_mode = #{chargeMode}),0) AS insertCount,
- IFNULL((SELECT COUNT(*) FROM t_charging_gun WHERE status = 4 AND charge_mode = #{chargeMode}),0) AS chargingCount
+ IFNULL((SELECT COUNT(*) FROM t_charging_gun WHERE status = 2 AND charge_mode = #{chargeMode} and del_flag = 0),0) AS freeCount,
+ IFNULL((SELECT COUNT(*) FROM t_charging_gun WHERE status = 5 AND charge_mode = #{chargeMode} and del_flag = 0),0) AS filledCount,
+ IFNULL((SELECT COUNT(*) FROM t_charging_gun WHERE status = 3 AND charge_mode = #{chargeMode} and del_flag = 0),0) AS insertCount,
+ IFNULL((SELECT COUNT(*) FROM t_charging_gun WHERE status = 4 AND charge_mode = #{chargeMode} and del_flag = 0),0) AS chargingCount
FROM t_charging_gun
WHERE del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()} AND charge_mode = #{chargeMode}
AND charging_pile_id in (
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 cdadf55..522954c 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
@@ -1296,7 +1296,7 @@
//当日的订单总数
int size = list.size();
//计算list中paymentAmount的总和
- BigDecimal totalPaymentAmount = list.stream().map(TChargingOrder::getOrderAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal totalPaymentAmount = list.stream().map(TChargingOrder::getPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
//计算list中electrovalence的总和
BigDecimal totalElectrovalence = list.stream().map(TChargingOrder::getElectrovalence).reduce(BigDecimal.ZERO, BigDecimal::add);
//计算list中serviceCharge的总和
--
Gitblit v1.7.1