From b67e3b2493a19983d24ec1a97be2295b2fa62ade Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 19 十月 2024 13:37:16 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml | 4 ++--
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 19 ++++++++-----------
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 2 +-
3 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index fddb374..d407038 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -103,7 +103,7 @@
{
if (StringUtils.isNotEmpty(perm))
{
- permsSet.addAll(Arrays.asList(perm.trim().split(",")));
+ permsSet.add(perm);
}
}
return permsSet;
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index 583bf3a..75db7c8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -96,14 +96,14 @@
</select>
<select id="selectMenuPerms" resultType="String">
- select distinct m.perms
+ select distinct m.path
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
</select>
<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
- select distinct m.perms
+ select distinct m.path
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
index dc70af6..264c505 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -326,7 +326,7 @@
FROM
t_charging_order
<where>
- del_flag = 0 and recharge_payment_status = 2 and ISNULL(refund_status)
+ del_flag = 0 and recharge_payment_status = 2
<if test="sixBefore != null">
AND create_time >= #{sixBefore}
</if>
@@ -349,7 +349,7 @@
FROM
t_charging_order
<where>
- del_flag = 0 and recharge_payment_status = 2 and ISNULL(refund_status)
+ del_flag = 0 and recharge_payment_status = 2
<if test="siteIds != null and siteIds.size() > 0">
AND site_id IN
<foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
@@ -368,7 +368,7 @@
<select id="countAll" resultType="java.util.Map">
select sum(electrovalence) as electrovalence,sum(service_charge) as service_charge,sum(commission_amount) as commission_amount,sum(sharing_amount) as sharing_amount
from t_charging_order
- where create_time >= #{sixBefore} and del_flag = 0 and recharge_payment_status = 2 and ISNULL(refund_status)
+ where create_time >= #{sixBefore} and del_flag = 0 and recharge_payment_status = 2
</select>
<select id="getSumByType" resultType="java.util.Map">
SELECT
@@ -399,7 +399,7 @@
FROM
t_charging_order
<where>
- del_flag = 0 and recharge_payment_status = 2 and ISNULL(refund_status) and DATE(create_time) = CURDATE()
+ del_flag = 0 and recharge_payment_status = 2 and DATE(create_time) = CURDATE()
<if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
AND id IN
<foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
@@ -423,7 +423,7 @@
FROM
t_charging_order
<where>
- del_flag = 0 and recharge_payment_status = 2 and ISNULL(refund_status) and YEARWEEK(DATE_FORMAT(create_time, '%Y-%m-%d'), 1) = YEARWEEK(NOW(), 1)
+ del_flag = 0 and recharge_payment_status = 2 and YEARWEEK(DATE_FORMAT(create_time, '%Y-%m-%d'), 1) = YEARWEEK(NOW(), 1)
<if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
AND id IN
<foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
@@ -447,7 +447,7 @@
FROM
t_charging_order
<where>
- del_flag = 0 and recharge_payment_status = 2 and ISNULL(refund_status) and MONTH(create_time) = MONTH(NOW()) AND YEAR(create_time) = YEAR(NOW())
+ del_flag = 0 and recharge_payment_status = 2 and MONTH(create_time) = MONTH(NOW()) AND YEAR(create_time) = YEAR(NOW())
<if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
AND id IN
<foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
@@ -472,7 +472,7 @@
FROM
t_charging_order
<where>
- del_flag = 0 and recharge_payment_status = 2 and ISNULL(refund_status) and YEAR(create_time) = YEAR(NOW())
+ del_flag = 0 and recharge_payment_status = 2 and YEAR(create_time) = YEAR(NOW())
<if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
AND id IN
<foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
@@ -496,7 +496,7 @@
FROM
t_charging_order
<where>
- del_flag = 0 and recharge_payment_status = 2 and ISNULL(refund_status)
+ del_flag = 0 and recharge_payment_status = 2
<if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
AND id IN
<foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
@@ -520,7 +520,6 @@
WHERE
del_flag = 0
AND recharge_payment_status = 2
- AND ISNULL(refund_status)
AND DATE(create_time) = CURDATE()
<if test="siteIds != null and siteIds.size() > 0">
AND site_id IN
@@ -542,7 +541,6 @@
WHERE
del_flag = 0
AND recharge_payment_status = 2
- AND ISNULL(refund_status)
AND DATE(create_time) = CURDATE() - INTERVAL 1 DAY
<if test="siteIds != null and siteIds.size() > 0">
AND site_id IN
@@ -570,7 +568,6 @@
WHERE
del_flag = 0
AND recharge_payment_status = 2
- AND ISNULL(refund_status)
<if test="siteIds != null and siteIds.size() > 0">
AND site_id IN
<foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
--
Gitblit v1.7.1