From ba0f5c3079fedcea55e3d375f319743e5daa239e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 22 七月 2026 14:37:34 +0800
Subject: [PATCH] 修改地图站点查询bug
---
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 688 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 533 insertions(+), 155 deletions(-)
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 81c0d09..6a746c9 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
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.TChargingOrderMapper">
@@ -23,11 +23,22 @@
<result column="recharge_amount" property="rechargeAmount"/>
<result column="recharge_payment_type" property="rechargePaymentType"/>
<result column="recharge_payment_status" property="rechargePaymentStatus"/>
+ <result column="pay_method" property="payMethod"/>
+ <result column="balance_pay_amount" property="balancePayAmount"/>
+ <result column="third_pay_amount" property="thirdPayAmount"/>
+ <result column="balance_refund_amount" property="balanceRefundAmount"/>
+ <result column="third_refund_amount" property="thirdRefundAmount"/>
<result column="recharge_serial_number" property="rechargeSerialNumber"/>
<result column="residual_amount" property="residualAmount"/>
<result column="order_amount" property="orderAmount"/>
<result column="app_coupon_id" property="appCouponId"/>
<result column="coupon_discount_amount" property="couponDiscountAmount"/>
+ <result column="is_whitelist" property="isWhitelist"/>
+ <result column="whitelist_id" property="whitelistId"/>
+ <result column="whitelist_benefit_type" property="whitelistBenefitType"/>
+ <result column="whitelist_discount_amount" property="whitelistDiscountAmount"/>
+ <result column="whitelist_electric_refund_amount" property="whitelistElectricRefundAmount"/>
+ <result column="whitelist_service_refund_amount" property="whitelistServiceRefundAmount"/>
<result column="vip_discount" property="vipDiscount"/>
<result column="vip_discount_amount" property="vipDiscountAmount"/>
<result column="payment_amount" property="paymentAmount"/>
@@ -46,9 +57,9 @@
<sql id="Base_Column_List">
id, code, order_type, order_classification, app_user_id, app_user_car_id,site_id, parking_lot_id,
charging_pile_id, charging_gun_id,
- start_time, end_time, status, recharge_amount, recharge_payment_type, recharge_payment_status,
+ start_time, end_time, status, recharge_amount, recharge_payment_type, recharge_payment_status, pay_method, balance_pay_amount, third_pay_amount, balance_refund_amount, third_refund_amount,
recharge_serial_number,
- order_amount, app_coupon_id, coupon_discount_amount, vip_discount, vip_discount_amount, payment_amount,
+ order_amount, app_coupon_id, coupon_discount_amount, is_whitelist, whitelist_id, whitelist_benefit_type, whitelist_discount_amount, whitelist_electric_refund_amount, whitelist_service_refund_amount, vip_discount, vip_discount_amount, payment_amount,
refund_code,
refund_amount, refund_status, refund_serial_number, refund_time, create_time,
del_flag,need_elec,total_electricity
@@ -80,7 +91,8 @@
</select>
<select id="chargingOrder" resultType="com.ruoyi.order.api.vo.ChargingOrderVO">
- select t1.*
+ select t1.*,
+ IFNULL(t1.whitelist_electric_refund_amount, 0) + IFNULL(t1.whitelist_service_refund_amount, 0) as whitelistRefundAmount
from t_charging_order t1
where t1.del_flag = 0
<if test="null != req.code and req.code!=''">
@@ -112,6 +124,18 @@
</if>
<if test="req.orderSource != null and req.orderSource == 3 ">
and t1.tripartite_platform_name = 'XinDianTu'
+ </if>
+ <if test="req.isWhitelist != null">
+ and t1.is_whitelist = #{req.isWhitelist}
+ </if>
+ <if test="req.paymentType != null and req.paymentType == 1 ">
+ and t1.recharge_payment_type = 1
+ </if>
+ <if test="req.paymentType != null and req.paymentType == 2 ">
+ and t1.recharge_payment_type in (2, 3)
+ </if>
+ <if test="req.paymentType != null and req.paymentType == 3 ">
+ and t1.pay_method in (1, 2)
</if>
<if test="req.siteId != null ">
and t1.site_id = #{req.siteId}
@@ -261,6 +285,8 @@
re.refund_title,
re.refund_reason,
re.refund_amount,
+ re.balance_refund_amount,
+ re.third_refund_amount,
re.refund_total_amount,
re.refund_time,
re.pay_type,
@@ -271,6 +297,7 @@
co.create_time as pay_time,
co.id as order_id,
co.app_user_id as user_id,
+ co.pay_method as pay_method,
1 as type
FROM t_charging_order_refund re
LEFT JOIN t_charging_order co ON re.charging_order_id = co.id
@@ -282,6 +309,8 @@
re.refund_title,
re.refund_reason,
re.refund_amount,
+ 0 as balance_refund_amount,
+ re.refund_amount as third_refund_amount,
re.refund_total_amount,
re.refund_time,
re.pay_type,
@@ -292,6 +321,7 @@
so.create_time as pay_time,
so.id as order_id,
so.app_user_id as user_id,
+ 3 as pay_method,
2 as type
FROM t_shopping_order_refund re
LEFT JOIN t_shopping_order so on re.shopping_order_id = so.id
@@ -303,6 +333,8 @@
vr.refund_title,
vr.refund_reason,
vr.refund_amount,
+ 0 as balance_refund_amount,
+ vr.refund_amount as third_refund_amount,
vr.refund_total_amount,
vr.refund_time,
vr.pay_type,
@@ -313,6 +345,7 @@
vo.create_time as pay_time,
vo.id as order_id,
vo.app_user_id as user_id,
+ 3 as pay_method,
3 as type
FROM t_vip_order_refund vr
LEFT JOIN t_vip_order vo on vr.vip_order_id = vo.id
@@ -355,28 +388,18 @@
</select>
<select id="charge" resultType="com.ruoyi.order.dto.SixChargingDto">
SELECT
- DATE_FORMAT( subquery.create_time, '%m' ) AS MONTH,
- SUM(electrovalence) AS electrovalence,
+ DATE_FORMAT(a.create_time, '%m') AS MONTH,
+ SUM(IFNULL(b.period_electric_price, 0)) AS electrovalence,
SUM(
- CASE
- WHEN subquery.order_source = 0 THEN subquery.service_charge
- WHEN subquery.order_source = 1 THEN subquery.service_charge
- ELSE subquery.service_charge * 0.8
- END
+ CASE
+ WHEN a.order_source = 0 THEN IFNULL(b.period_service_price, 0)
+ WHEN a.order_source = 1 THEN IFNULL(b.period_service_price, 0)
+ ELSE IFNULL(b.period_service_price, 0) * 0.8
+ END
) AS service_charge
-
- FROM
- (
- SELECT
- a.create_time,
- b.period_electric_price as electrovalence,
- b.period_service_price as service_charge,
- a.order_source
FROM
t_charging_order a
- left join (select charging_order_id, sum(period_electric_price) as period_electric_price,
- sum(period_service_price) as period_service_price, sum(period_electric_price + period_service_price) as money
- from t_charging_order_accounting_strategy group by charging_order_id) b on (a.id = b.charging_order_id)
+ LEFT JOIN t_charging_order_accounting_strategy b ON a.id = b.charging_order_id
<where>
a.del_flag = 0 and a.recharge_payment_status = 2 and a.status = 5
<if test="sixBefore != null">
@@ -389,25 +412,22 @@
</foreach>
</if>
</where>
- ) AS subquery
GROUP BY
- DATE_FORMAT( subquery.create_time, '%m' )
+ DATE_FORMAT(a.create_time, '%m')
</select>
<select id="circle" resultType="com.ruoyi.order.dto.SixCircleDto">
SELECT
- site_id as siteId,
+ a.site_id as siteId,
ROUND(SUM(CASE
- WHEN a.order_source = 0 THEN b.money
- WHEN a.order_source = 1 THEN b.money
- ELSE (b.period_electric_price + b.period_service_price * 0.8)
+ WHEN a.order_source = 0 THEN IFNULL(b.period_electric_price, 0) + IFNULL(b.period_service_price, 0)
+ WHEN a.order_source = 1 THEN IFNULL(b.period_electric_price, 0) + IFNULL(b.period_service_price, 0)
+ ELSE (IFNULL(b.period_electric_price, 0) + IFNULL(b.period_service_price, 0) * 0.8)
END), 2) AS paymentAmount
FROM
t_charging_order a
- left join (select charging_order_id, sum(period_electric_price) as period_electric_price,
- sum(period_service_price) as period_service_price, sum(period_electric_price + period_service_price) as money
- from t_charging_order_accounting_strategy group by charging_order_id) b on (a.id = b.charging_order_id)
+ LEFT JOIN t_charging_order_accounting_strategy b ON a.id = b.charging_order_id
<where>
a.del_flag = 0 and a.recharge_payment_status = 2 and a.status = 5
<if test="siteIds != null and siteIds.size() > 0">
@@ -417,7 +437,7 @@
</foreach>
</if>
<if test="sixBefore != null">
- AND create_time >= #{sixBefore}
+ AND a.create_time >= #{sixBefore}
</if>
</where>
GROUP BY a.site_id
@@ -425,13 +445,25 @@
</select>
<select id="countAll" resultType="java.util.Map">
- select sum(electrovalence) as electrovalence,sum(service_charge) as
- service_charge,ROUND(sum(electrovalence+service_charge) * 0.006, 2) as commission_amount,sum(sharing_amount) as
- sharing_amount
- from t_charging_order
- where del_flag = 0 and recharge_payment_status = 2 and status = 5
+ SELECT
+ ROUND(SUM(IFNULL(b.period_electric_price, 0)), 2) AS electrovalence,
+ ROUND(SUM(CASE
+ WHEN a.order_source = 2 THEN IFNULL(b.period_service_price, 0) * 0.8
+ ELSE IFNULL(b.period_service_price, 0)
+ END), 2) AS service_charge,
+ ROUND(SUM(CASE
+ WHEN a.order_source = 2 THEN 0
+ ELSE IFNULL(b.period_electric_price, 0) + IFNULL(b.period_service_price, 0)
+ END) * 0.006, 2) AS commission_amount,
+ ROUND(SUM(CASE
+ WHEN a.order_source = 2 THEN IFNULL(b.period_service_price, 0) * 0.2
+ ELSE 0
+ END), 2) AS sharing_amount
+ FROM t_charging_order a
+ LEFT JOIN t_charging_order_accounting_strategy b ON a.id = b.charging_order_id
+ WHERE a.del_flag = 0 AND a.recharge_payment_status = 2 AND a.status = 5
<if test="siteIds != null and siteIds.size() > 0">
- AND site_id IN
+ AND a.site_id IN
<foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
#{siteId}
</foreach>
@@ -458,8 +490,7 @@
FROM
t_charging_order_accounting_strategy t1
LEFT JOIN t_charging_order t2 on t1.charging_order_id = t2.id
- where t2.del_flag = 0 and t2.status = 5 and t2.recharge_payment_status = 2 and t2.create_time between #{start}
- and #{end}
+ where t2.del_flag = 0 and t2.recharge_payment_status = 2 and t2.start_time IS NOT NULL and t2.end_time is not null and t2.pay_time between #{start} and #{end}
<if test="null != siteIds and siteIds.size() > 0">
and t2.site_id in
<foreach collection="siteIds" separator="," open="(" close=")" item="item" index="index">
@@ -471,7 +502,7 @@
</select>
<select id="getDateData" resultType="java.util.Map">
SELECT
- DATE_FORMAT(a.create_time, '%H:00' ) as time,
+ DATE_FORMAT(a.pay_time, '%H:00' ) as time,
SUM(CASE
WHEN a.order_source = 0 THEN b.period_service_price
WHEN a.order_source = 1 THEN b.period_service_price
@@ -491,8 +522,8 @@
sum(period_service_price) as period_service_price, sum(period_electric_price + period_service_price) as money
from t_charging_order_accounting_strategy group by charging_order_id) b on (a.id = b.charging_order_id)
<where>
- a.del_flag = 0 and a.status = 5 and a.recharge_payment_status = 2 and DATE(a.create_time) = CURDATE()
- and a.create_time between #{start} and #{end}
+ a.del_flag = 0 and a.recharge_payment_status = 2 and a.start_time IS NOT NULL and a.end_time is not null
+ and a.pay_time between #{start} and #{end}
<if test="null != siteIds and siteIds.size() > 0">
and a.site_id in
<foreach collection="siteIds" separator="," open="(" close=")" item="item" index="index">
@@ -508,7 +539,7 @@
</select>
<select id="getWeekData" resultType="java.util.Map">
SELECT
- DATE_FORMAT(a.create_time, '%Y-%m-%d' ) as time,
+ DATE_FORMAT(a.pay_time, '%Y-%m-%d' ) as time,
SUM(CASE
WHEN a.order_source = 0 THEN b.period_service_price
WHEN a.order_source = 1 THEN b.period_service_price
@@ -528,9 +559,8 @@
sum(period_service_price) as period_service_price, sum(period_electric_price + period_service_price) as money
from t_charging_order_accounting_strategy group by charging_order_id) b on (a.id = b.charging_order_id)
<where>
- a.del_flag = 0 and a.status = 5 and a.recharge_payment_status = 2 and YEARWEEK(DATE_FORMAT(a.create_time,
- '%Y-%m-%d'), 1) = YEARWEEK(NOW(), 1)
- and a.create_time between #{start} and #{end}
+ a.del_flag = 0 and a.recharge_payment_status = 2 and a.start_time IS NOT NULL and a.end_time is not null
+ and a.pay_time between #{start} and #{end}
<if test="null != siteIds and siteIds.size() > 0">
and a.site_id in
<foreach collection="siteIds" separator="," open="(" close=")" item="item" index="index">
@@ -546,7 +576,7 @@
</select>
<select id="getMonthData" resultType="java.util.Map">
SELECT
- DATE_FORMAT(a.create_time, '%Y-%m-%d' ) as time,
+ DATE_FORMAT(a.pay_time, '%Y-%m-%d' ) as time,
SUM(CASE
WHEN a.order_source = 0 THEN b.period_service_price
WHEN a.order_source = 1 THEN b.period_service_price
@@ -566,9 +596,8 @@
sum(period_service_price) as period_service_price, sum(period_electric_price + period_service_price) as money
from t_charging_order_accounting_strategy group by charging_order_id) b on (a.id = b.charging_order_id)
<where>
- a.del_flag = 0 and a.status = 5 and a.recharge_payment_status = 2 and MONTH(a.create_time) = MONTH(NOW())
- AND YEAR(a.create_time) = YEAR(NOW())
- and a.create_time between #{start} and #{end}
+ a.del_flag = 0 and a.recharge_payment_status = 2 and a.start_time IS NOT NULL and a.end_time is not null
+ and a.pay_time between #{start} and #{end}
<if test="null != siteIds and siteIds.size() > 0">
and a.site_id in
<foreach collection="siteIds" separator="," open="(" close=")" item="item" index="index">
@@ -584,7 +613,7 @@
</select>
<select id="getYearData" resultType="java.util.Map">
SELECT
- DATE_FORMAT(a.create_time, '%Y-%m-%d' ) as time,
+ DATE_FORMAT(a.pay_time, '%Y-%m-%d' ) as time,
SUM(CASE
WHEN a.order_source = 0 THEN b.period_service_price
WHEN a.order_source = 1 THEN b.period_service_price
@@ -604,8 +633,8 @@
sum(period_service_price) as period_service_price, sum(period_electric_price + period_service_price) as money
from t_charging_order_accounting_strategy group by charging_order_id) b on (a.id = b.charging_order_id)
<where>
- a.del_flag = 0 and a.status = 5 and a.recharge_payment_status = 2 and YEAR(a.create_time) = YEAR(NOW())
- and a.create_time between #{start} and #{end}
+ a.del_flag = 0 and a.recharge_payment_status = 2 and a.start_time IS NOT NULL and a.end_time is not null
+ and a.pay_time between #{start} and #{end}
<if test="null != siteIds and siteIds.size() > 0">
and a.site_id in
<foreach collection="siteIds" separator="," open="(" close=")" item="item" index="index">
@@ -620,7 +649,7 @@
</select>
<select id="getByDate" resultType="java.util.Map">
SELECT
- DATE_FORMAT(a.create_time, '%Y-%m-%d' ) as time,
+ DATE_FORMAT(a.pay_time, '%Y-%m-%d' ) as time,
SUM(CASE
WHEN a.order_source = 0 THEN b.period_service_price
WHEN a.order_source = 1 THEN b.period_service_price
@@ -640,8 +669,8 @@
sum(period_service_price) as period_service_price, sum(period_electric_price + period_service_price) as money
from t_charging_order_accounting_strategy group by charging_order_id) b on (a.id = b.charging_order_id)
<where>
- a.del_flag = 0 and a.status = 5 and a.recharge_payment_status = 2
- and a.create_time between #{start} and #{end}
+ a.del_flag = 0 and a.recharge_payment_status = 2 and a.start_time IS NOT NULL and a.end_time is not null
+ and a.pay_time between #{start} and #{end}
<if test="null != siteIds and siteIds.size() > 0">
and a.site_id in
<foreach collection="siteIds" separator="," open="(" close=")" item="item" index="index">
@@ -983,55 +1012,108 @@
</select>
<select id="chargingList" resultType="com.ruoyi.order.api.vo.ChargingOrderListVO">
- select t1.*,
- t1.current as chargingCapacity,
- t1.payment_amount as paymentAmount,
- t1.electricity as chargingCapacity,
- ifnull(t2.refund_amount, 0) as refundAmount
- from t_charging_order t1
- left join t_charging_order_refund t2 on t1.id = t2.charging_order_id
- where t1.del_flag = 0 and t1.recharge_payment_status = 2
+ select
+ a.id,
+ b.`name` as siteName,
+ a.`status`,
+ a.recharge_payment_type as rechargePaymentType,
+ a.pay_method as payMethod,
+ a.recharge_payment_status as rechargePaymentStatus,
+ a.site_id as siteId,
+ a.charging_pile_id as chargingPileId,
+ a.app_user_id as appUserId,
+ a.app_user_car_id as appUserCarId,
+ c.license_plate as plateNum,
+ a.start_charge_seq as startChargeSeq,
+ a.charging_gun_id as chargingGunId,
+ a.order_source as orderSource,
+ a.`code`,
+ a.order_type as orderType,
+ d.`name` as terminalName,
+ UNIX_TIMESTAMP(a.end_time) - UNIX_TIMESTAMP(a.start_time) as chargingSecond,
+ a.electricity as chargingCapacity,
+ a.electricity as electricity,
+ a.recharge_amount as rechargeAmount,
+ a.payment_amount as orderAmount,
+ a.vip_discount_amount as vipDiscountAmount,
+ e.refund_amount as refundAmount,
+ a.is_whitelist as isWhitelist,
+ IFNULL(a.whitelist_electric_refund_amount, 0) + IFNULL(a.whitelist_service_refund_amount, 0) as whitelistRefundAmount,
+ IFNULL(a.whitelist_electric_refund_amount, 0) as whitelistElectricRefundAmount,
+ IFNULL(a.whitelist_service_refund_amount, 0) as whitelistServiceRefundAmount,
+ c.license_plate as licensePlate,
+ f.phone,
+ a.payment_amount as paymentAmount,
+ a.third_pay_amount as thirdPayAmount,
+ a.balance_pay_amount as balancePayAmount,
+ e.refund_amount as residualAmount,
+ h.electrovalence as electrovalence,
+ CASE WHEN a.order_source = 1 THEN h.serviceCharge ELSE h.serviceCharge * 0.8 END as serviceCharge,
+ CASE WHEN a.order_source = 2 THEN h.serviceCharge * 0.2 ELSE 0 END as sharingAmount,
+ 0 as commissionAmount,
+ <!-- 引流平台分佣按三方订单原始服务费的20%计算，导出需展示在白名单字段前。 -->
+ CASE WHEN a.order_source = 2 THEN IFNULL(h.serviceCharge, 0) * 0.2 ELSE 0 END as sharingAmount,
+ a.tripartite_platform_name as tripartitePlatformName,
+ a.create_time as createTime,
+ a.start_time as startTime,
+ a.end_time as endTime,
+ a.end_mode as endMode,
+ a.pay_time as payTime,
+ a.start_soc as startSoc,
+ a.end_soc as endSoc,
+ g.`name` as accountingStrategyName
+ from charging_pile_order.t_charging_order a
+ left join charging_pile_service.t_site b on (a.site_id = b.id)
+ left join charging_pile_account.t_app_user_car c on (a.app_user_car_id = c.id)
+ left join charging_pile_service.t_charging_gun d on (a.charging_gun_id = d.id)
+ left join charging_pile_order.t_charging_order_refund e on (a.id = e.charging_order_id)
+ left join charging_pile_account.t_app_user f on (a.app_user_id = f.id)
+ left join charging_pile_order.t_accounting_strategy_order g on (a.id = g.charging_order_id)
+ left join (select sum(period_electric_price) as electrovalence,sum(period_service_price) as serviceCharge,charging_order_id from charging_pile_order.t_charging_order_accounting_strategy group by charging_order_id) as h on (a.id = h.charging_order_id)
+ where a.del_flag = 0 and a.recharge_payment_status = 2
<if test="null != req.code and req.code!=''">
- and t1.code LIKE CONCAT('%',#{req.code},'%')
+ and a.code LIKE CONCAT('%',#{req.code},'%')
</if>
<if test="null != req.carIds and req.carIds.size()>0">
- and t1.app_user_car_id in
+ and a.app_user_car_id in
<foreach collection="req.carIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</if>
<if test="null != req.userIds and req.userIds.size()>0">
- and t1.app_user_id in
+ and a.app_user_id in
<foreach collection="req.userIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</if>
<if test="null != req.siteIds and req.siteIds.size()>0">
- and t1.site_id in
+ and a.site_id in
<foreach collection="req.siteIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</if>
<if test="req.orderType != null ">
- and t1.order_type = #{req.orderType}
+ and a.order_type = #{req.orderType}
</if>
<if test="req.status != null ">
- and t1.status = #{req.status}
+ and a.status = #{req.status}
</if>
<if test="req.status != null ">
- and t1.status = #{req.status}
+ and a.status = #{req.status}
+ </if>
+ <if test="req.isWhitelist != null">
+ and a.is_whitelist = #{req.isWhitelist}
</if>
<if test="req.siteId != null ">
- and t1.site_id = #{req.siteId}
+ and a.site_id = #{req.siteId}
</if>
<if test="startTime1 != null and startTime1!=''">
- and (t1.create_time between #{startTime1} and #{startTime2})
+ and (a.pay_time between #{startTime1} and #{startTime2})
</if>
<if test="endTime1 != null and endTime1!=''">
- and (t1.end_time between #{endTime1} and #{endTime2})
+ and (a.end_time between #{endTime1} and #{endTime2})
</if>
- and t1.start_time IS NOT NULL
- order by t1.create_time desc
+ and a.start_time IS NOT NULL order by a.create_time desc
</select>
@@ -1039,13 +1121,21 @@
select
aa.id,
aa.`code`,
+ aa.siteId,
aa.siteName,
aa.orderType,
aa.terminalName,
aa.electricity,
aa.rechargeAmount,
aa.rechargePaymentType,
+ aa.payMethod,
+ aa.isWhitelist,
+ aa.whitelistRefundAmount,
+ aa.whitelistElectricRefundAmount,
+ aa.whitelistServiceRefundAmount,
aa.paymentAmount,
+ aa.thirdPayAmount,
+ aa.balancePayAmount,
aa.electrovalence,
aa.serviceCharge,
aa.orderSource,
@@ -1069,13 +1159,21 @@
select
b.id,
b.`code`,
+ b.site_id as siteId,
c.`name` as siteName,
b.order_type as orderType,
CONCAT(d.`name`, '-', e.`name`) as terminalName,
b.electricity,
b.recharge_amount as rechargeAmount,
b.recharge_payment_type as rechargePaymentType,
+ b.pay_method as payMethod,
+ b.is_whitelist as isWhitelist,
+ IFNULL(b.whitelist_electric_refund_amount, 0) + IFNULL(b.whitelist_service_refund_amount, 0) as whitelistRefundAmount,
+ IFNULL(b.whitelist_electric_refund_amount, 0) as whitelistElectricRefundAmount,
+ IFNULL(b.whitelist_service_refund_amount, 0) as whitelistServiceRefundAmount,
b.payment_amount as paymentAmount,
+ b.third_pay_amount as thirdPayAmount,
+ b.balance_pay_amount as balancePayAmount,
b.electrovalence,
b.service_charge as serviceCharge,
b.order_source as orderSource,
@@ -1133,18 +1231,22 @@
<if test="req.status != null ">
and b.status = #{req.status}
</if>
+ <if test="req.isWhitelist != null">
+ and b.is_whitelist = #{req.isWhitelist}
+ </if>
<if test="req.siteId != null ">
and b.site_id = #{req.siteId}
</if>
<if test="startTime1 != null and startTime1!=''">
- and (b.create_time between #{startTime1} and #{startTime2})
+ and b.pay_time between #{startTime1} and #{startTime2}
</if>
- <if test="endTime1 != null and endTime1!=''">
- and (b.end_time between #{endTime1} and #{endTime2})
+ <if test="endTime1 != null and endTime2!=''">
+ and b.end_time between #{endTime1} and #{endTime2}
</if>
- and b.start_time IS NOT NULL
- ) as aa group by aa.id, aa.`code`, aa.siteName, aa.orderType, aa.terminalName, aa.electricity, aa.rechargeAmount, aa.paymentAmount, aa.electrovalence, aa.serviceCharge, aa.tripartitePlatformName,
- aa.startTime, aa.endTime, aa.chargingSecond, aa.startSoc, aa.endSoc, aa.`status`, aa.endMode, aa.phone, aa.licensePlate, aa.orderSource, aa.rechargePaymentType order by aa.startTime desc
+ and b.start_time IS NOT NULL and b.end_time is not null
+ ) as aa group by aa.id, aa.`code`, aa.siteId, aa.siteName, aa.orderType, aa.terminalName, aa.electricity, aa.rechargeAmount, aa.paymentAmount, aa.thirdPayAmount, aa.balancePayAmount, aa.electrovalence, aa.serviceCharge, aa.tripartitePlatformName,
+ aa.startTime, aa.endTime, aa.chargingSecond, aa.startSoc, aa.endSoc, aa.`status`, aa.endMode, aa.phone, aa.licensePlate, aa.orderSource, aa.rechargePaymentType, aa.payMethod,
+ aa.isWhitelist, aa.whitelistRefundAmount, aa.whitelistElectricRefundAmount, aa.whitelistServiceRefundAmount order by aa.startTime desc
</select>
@@ -1204,17 +1306,76 @@
<if test="req.status != null ">
and co.status = #{req.status}
</if>
+ <if test="req.isWhitelist != null">
+ and co.is_whitelist = #{req.isWhitelist}
+ </if>
<if test="req.siteId != null ">
and co.site_id = #{req.siteId}
</if>
<if test="startTime1 != null and startTime1!=''">
- and (co.create_time between #{startTime1} and #{startTime2})
+ and co.pay_time between #{startTime1} and #{startTime2}
</if>
- <if test="endTime1 != null and endTime1!=''">
- and (co.end_time between #{endTime1} and #{endTime2})
+ <if test="endTime1 != null and endTime2!=''">
+ and co.end_time between #{endTime1} and #{endTime2}
</if>
- and co.start_time IS NOT NULL order by co.create_time desc
+ and co.start_time IS NOT NULL and co.end_time is not null
) as a group by a.id
+ </select>
+
+
+ <select id="chargingListSum1" resultType="map">
+ select
+ count(a.id) as orderCount,
+ sum(a.charging_capacity) as electronic,
+ sum(a.period_electric_price) as electrovalence,
+ sum(CASE WHEN a.order_source = 2 THEN a.period_service_price * 0.8 ELSE a.period_service_price END) as serviceCharge,
+ sum(a.period_electric_price + (CASE WHEN a.order_source = 2 THEN a.period_service_price * 0.8 ELSE a.period_service_price END)) as paymentAmount
+ from (
+ select co.id,coas.charging_capacity, coas.period_electric_price, coas.period_service_price, co.order_source
+ from t_charging_order_accounting_strategy coas
+ left join t_charging_order co on (coas.charging_order_id = co.id)
+ where co.del_flag = 0 and co.recharge_payment_status = 2
+ <if test="null != req.code and req.code!=''">
+ and co.code LIKE CONCAT('%',#{req.code},'%')
+ </if>
+ <if test="null != req.carIds and req.carIds.size()>0">
+ and co.app_user_car_id in
+ <foreach collection="req.carIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="null != req.userIds and req.userIds.size()>0">
+ and co.app_user_id in
+ <foreach collection="req.userIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="null != req.siteIds and req.siteIds.size()>0">
+ and co.site_id in
+ <foreach collection="req.siteIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="req.orderType != null ">
+ and co.order_type = #{req.orderType}
+ </if>
+ <if test="req.status != null ">
+ and co.status = #{req.status}
+ </if>
+ <if test="req.isWhitelist != null">
+ and co.is_whitelist = #{req.isWhitelist}
+ </if>
+ <if test="req.siteId != null ">
+ and co.site_id = #{req.siteId}
+ </if>
+ <if test="startTime1 != null and startTime1!=''">
+ and co.pay_time between #{startTime1} and #{startTime2}
+ </if>
+ <if test="endTime1 != null and endTime2!=''">
+ and co.end_time between #{endTime1} and #{endTime2}
+ </if>
+ and co.start_time IS NOT NULL and co.end_time is not null
+ ) as a
</select>
@@ -1246,6 +1407,9 @@
</if>
<if test="req.status != null ">
and t1.status = #{req.status}
+ </if>
+ <if test="req.isWhitelist != null">
+ and t1.is_whitelist = #{req.isWhitelist}
</if>
<if test="req.siteId != null ">
and t1.site_id = #{req.siteId}
@@ -1674,6 +1838,36 @@
</select>
+
+
+ <select id="getChargingOrderCount" resultType="java.util.Map">
+ select
+ count(a.id) as num,
+ sum(b.charging_capacity) as charging_capacity,
+ sum(CASE WHEN a.order_source = 0 THEN b.period_service_price
+ WHEN a.order_source = 1 THEN b.period_service_price
+ ELSE b.period_service_price * 0.8
+ END) as servicecharge,
+ sum(b.period_electric_price) as electrovalence,
+ sum(b.charging_capacity) as electricity
+ from t_charging_order a
+ left join (
+ select charging_order_id,
+ sum(period_service_price) as period_service_price,
+ sum(period_electric_price) as period_electric_price,
+ sum(charging_capacity) as charging_capacity
+ from t_charging_order_accounting_strategy group by charging_order_id
+ ) as b on (a.id = b.charging_order_id)
+ where a.del_flag = 0 and a.status = 5 and a.recharge_payment_status = 2 and DATE_FORMAT(a.create_time, '%Y-%m-%d') = #{time}
+ <if test="siteIds != null and siteIds.size() > 0">
+ and a.site_id IN
+ <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
+ #{siteId}
+ </foreach>
+ </if>
+ </select>
+
+
<select id="getHourType" resultType="java.util.Map">
select
aa.time,
@@ -1928,73 +2122,169 @@
</select>
+ <sql id="ChargingOrderSummaryWhere">
+ where b.del_flag = 0 and b.recharge_payment_status = 2 and b.start_time IS NOT NULL and b.end_time is not null
+ <if test="null != req.code and req.code!=''">
+ and b.code LIKE CONCAT('%',#{req.code},'%')
+ </if>
+ <if test="null != req.userIds and req.userIds.size()>0">
+ and b.app_user_id in
+ <foreach collection="req.userIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="null != req.siteIds and req.siteIds.size()>0">
+ and b.site_id in
+ <foreach collection="req.siteIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="req.orderType != null ">
+ and b.order_type = #{req.orderType}
+ </if>
+ <if test="req.status != null ">
+ and b.status = #{req.status}
+ </if>
+ <if test="req.orderSource != null and req.orderSource == 1 ">
+ and (b.order_source = 0 or b.order_source = 1 )
+ </if>
+ <if test="req.orderSource != null and req.orderSource == 2 ">
+ and b.tripartite_platform_name = 'KuaiDian'
+ </if>
+ <if test="req.orderSource != null and req.orderSource == 3 ">
+ and b.tripartite_platform_name = 'XinDianTu'
+ </if>
+ <if test="req.isWhitelist != null">
+ and b.is_whitelist = #{req.isWhitelist}
+ </if>
+ <if test="req.paymentType != null and req.paymentType == 1 ">
+ and b.recharge_payment_type = 1
+ </if>
+ <if test="req.paymentType != null and req.paymentType == 2 ">
+ and b.recharge_payment_type in (2, 3)
+ </if>
+ <if test="req.paymentType != null and req.paymentType == 3 ">
+ and b.pay_method in (1, 2)
+ </if>
+ <if test="req.siteId != null ">
+ and b.site_id = #{req.siteId}
+ </if>
+ <if test="req.pileId != null ">
+ and b.charging_pile_id = #{req.pileId}
+ </if>
+ <if test="req.gunId != null ">
+ and b.charging_gun_id = #{req.gunId}
+ </if>
+ <if test="startTime1 != null and startTime1!=''">
+ and (b.pay_time between #{startTime1} and #{startTime2})
+ </if>
+ <if test="endTime1 != null and endTime1!=''">
+ and (b.end_time between #{endTime1} and #{endTime2})
+ </if>
+ </sql>
+
<select id="chargingOrderNolimit" resultType="map">
select
- sum(aa.electricity) as total,
- sum(aa.charging_time) as `time`,
- sum(aa.charging_amount) as paymentMoney,
- sum(aa.period_electric_price) as electronicMoney,
- sum(aa.period_service_price) as serviceMoney
+ sum(aa.time) as `time`,
+ sum(aa.income) as income,
+ sum(aa.electronicMoney) as electronicMoney,
+ sum(aa.serviceMoney) as serviceMoney,
+ sum(aa.total) as total
from (
select
- ifnull(a.electricity, 0) as electricity,
- UNIX_TIMESTAMP(ifnull(a.end_time, now())) - UNIX_TIMESTAMP(ifnull(a.start_time, now())) as charging_time,
- ifnull(a.recharge_amount - b.refund_amount, 0) as charging_amount,
- ifnull(c.period_electric_price, 0) as period_electric_price,
- ifnull(c.period_service_price, 0) as period_service_price
- from t_charging_order a
- left join (select charging_order_id, sum(refund_amount) as refund_amount from t_charging_order_refund where refund_status = 2 group by charging_order_id) b on (a.id = b.charging_order_id)
- left join (select charging_order_id, sum(period_electric_price) as period_electric_price, sum(period_service_price) as period_service_price from t_charging_order_accounting_strategy group by charging_order_id) c on (a.id = c.charging_order_id)
- where a.del_flag = 0
- <if test="null != req.code and req.code!=''">
- and a.code LIKE CONCAT('%',#{req.code},'%')
- </if>
- <if test="null != req.userIds and req.userIds.size()>0">
- and a.app_user_id in
- <foreach collection="req.userIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </if>
- <if test="null != req.siteIds and req.siteIds.size()>0">
- and a.site_id in
- <foreach collection="req.siteIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </if>
- <if test="req.orderType != null ">
- and a.order_type = #{req.orderType}
- </if>
- <if test="req.status != null ">
- and a.status = #{req.status}
- </if>
- <if test="req.orderSource != null and req.orderSource == 1 ">
- and (a.order_source = 0 or a.order_source = 1 )
- </if>
- <if test="req.orderSource != null and req.orderSource == 2 ">
- and a.tripartite_platform_name = 'KuaiDian'
- </if>
- <if test="req.orderSource != null and req.orderSource == 3 ">
- and a.tripartite_platform_name = 'XinDianTu'
- </if>
- <if test="req.siteId != null ">
- and a.site_id = #{req.siteId}
- </if>
- <if test="req.pileId != null ">
- and a.charging_pile_id = #{req.pileId}
- </if>
- <if test="req.gunId != null ">
- and a.charging_gun_id = #{req.gunId}
- </if>
- <if test="startTime1 != null and startTime1!=''">
- and (a.start_time between #{startTime1} and #{startTime2})
- </if>
- <if test="endTime1 != null and endTime1!=''">
- and (a.end_time between #{endTime1} and #{endTime2})
- </if>
+ b.id,
+ (UNIX_TIMESTAMP(b.end_time) - UNIX_TIMESTAMP(b.start_time)) as time,
+ sum(a.charging_capacity) as total,
+ sum(a.period_electric_price) as electronicMoney,
+ sum(CASE WHEN b.order_source = 1 THEN a.period_service_price ELSE a.period_service_price * 0.8 END) as serviceMoney,
+ sum(a.period_electric_price + (CASE WHEN b.order_source = 1 THEN a.period_service_price ELSE a.period_service_price * 0.8 END)) as income
+ from `charging_pile_order`.t_charging_order_accounting_strategy a
+ left join `charging_pile_order`.t_charging_order b on (a.charging_order_id = b.id)
+ <include refid="ChargingOrderSummaryWhere"/>
+ group by b.id,time
) as aa
</select>
+ <select id="chargingOrderFundSummary" resultType="map">
+ select
+ sum(CASE WHEN aa.recharge_payment_type = 1 and aa.thirdNetAmount > 0 THEN aa.thirdNetAmount ELSE 0 END) as wechatIncome,
+ sum(CASE WHEN aa.recharge_payment_type in (2, 3) and aa.thirdNetAmount > 0 THEN aa.thirdNetAmount ELSE 0 END) as alipayIncome,
+ 0 as balanceIncome,
+ 0 as platformIncomeTotal,
+ 0 as partnerIncomeTotal,
+ sum(CASE WHEN aa.is_whitelist = 1 THEN IFNULL(aa.electrovalence, 0) + IFNULL(aa.serviceCharge, 0) ELSE 0 END) as whitelistChargingIncome,
+ sum(CASE WHEN aa.is_whitelist = 1 THEN IFNULL(aa.whitelist_electric_refund_amount, 0) + IFNULL(aa.whitelist_service_refund_amount, 0) ELSE 0 END) as whitelistRefund
+ from (
+ select
+ b.id,
+ b.recharge_payment_type,
+ b.is_whitelist,
+ b.electrovalence,
+ b.service_charge as serviceCharge,
+ b.whitelist_electric_refund_amount,
+ b.whitelist_service_refund_amount,
+ IFNULL(b.third_pay_amount, CASE WHEN b.pay_method = 3 THEN IFNULL(b.payment_amount, IFNULL(b.recharge_amount, 0)) ELSE 0 END) - IFNULL(b.third_refund_amount, CASE WHEN b.pay_method = 3 THEN IFNULL(b.refund_amount, 0) ELSE 0 END) as thirdNetAmount
+ from `charging_pile_order`.t_charging_order b
+ <include refid="ChargingOrderSummaryWhere"/>
+ ) as aa
+ </select>
+ <select id="chargingOrderSummaryOrderIds" resultType="java.lang.Long">
+ select b.id
+ from `charging_pile_order`.t_charging_order b
+ <include refid="ChargingOrderSummaryWhere"/>
+ </select>
+
+ <select id="exchangeCodeBalanceSummary" resultType="map">
+ select
+ sum(CASE WHEN change_type = 2 THEN IFNULL(used_amount, 0) - IFNULL(gift_used_amount, 0) WHEN change_type = 3 THEN -(IFNULL(used_amount, 0) - IFNULL(gift_used_amount, 0)) ELSE 0 END) as balanceIncome,
+ sum(CASE WHEN change_type = 2 THEN IFNULL(gift_used_amount, 0) WHEN change_type = 3 THEN -IFNULL(gift_used_amount, 0) ELSE 0 END) as balanceGiftIncome
+ from `charging_pile_other`.t_exchange_code_use_record
+ where del_flag = 0 and change_type in (2, 3)
+ <if test="orderIds != null and orderIds.size()>0">
+ and order_id in
+ <foreach collection="orderIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ </select>
+
+ <select id="exchangeCodeBalanceIncomeByOrderIds" resultType="map">
+ select
+ order_id as orderId,
+ sum(CASE WHEN change_type = 2 THEN IFNULL(used_amount, 0) - IFNULL(gift_used_amount, 0) WHEN change_type = 3 THEN -(IFNULL(used_amount, 0) - IFNULL(gift_used_amount, 0)) ELSE 0 END) as balanceIncome,
+ sum(CASE WHEN change_type = 2 THEN IFNULL(gift_used_amount, 0) WHEN change_type = 3 THEN -IFNULL(gift_used_amount, 0) ELSE 0 END) as balanceGiftIncome
+ from `charging_pile_other`.t_exchange_code_use_record
+ where del_flag = 0 and order_id is not null and order_id != 0 and change_type in (2, 3)
+ <if test="orderIds != null and orderIds.size()>0">
+ and order_id in
+ <foreach collection="orderIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ group by order_id
+ </select>
+
+ <select id="exchangeCodeBalanceIncomeDetail" resultType="com.ruoyi.order.api.vo.ChargingOrderBalanceIncomeDetailVO">
+ select
+ p.id as packageId,
+ p.package_name as packageName,
+ sum(CASE WHEN r.change_type = 2 THEN IFNULL(r.used_amount, 0) - IFNULL(r.gift_used_amount, 0) WHEN r.change_type = 3 THEN -(IFNULL(r.used_amount, 0) - IFNULL(r.gift_used_amount, 0)) ELSE 0 END) as balanceIncome,
+ sum(CASE WHEN r.change_type = 2 THEN IFNULL(r.gift_used_amount, 0) WHEN r.change_type = 3 THEN -IFNULL(r.gift_used_amount, 0) ELSE 0 END) as giftIncome
+ from `charging_pile_other`.t_exchange_code_use_record r
+ left join `charging_pile_other`.t_exchange_code_detail d on r.detail_id = d.id
+ left join `charging_pile_other`.t_exchange_code_package p on d.package_id = p.id
+ where r.del_flag = 0 and r.change_type in (2, 3)
+ <if test="orderIds != null and orderIds.size()>0">
+ and r.order_id in
+ <foreach collection="orderIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ group by p.id, p.package_name
+ having balanceIncome != 0 or giftIncome != 0
+ order by p.id desc
+ </select>
<select id="countOrdersByDate" resultType="com.ruoyi.order.vo.OrderCountByDate">
@@ -2021,15 +2311,10 @@
FROM
t_charging_order
WHERE
- `status` = 2 and order_source = 1
+ `status` = 2
AND recharge_payment_status = 2
- AND NOW() >= ADDDATE(pay_time, INTERVAL 15 MINUTE )
+ AND (NOW() >= ADDDATE(pay_time, INTERVAL 15 MINUTE ) OR NOW() >= ADDDATE(create_time, INTERVAL 30 MINUTE ))
AND del_flag = 0
- AND id NOT IN (
- SELECT
- charging_order_id
- FROM
- t_charging_order_refund)
</select>
@@ -2039,7 +2324,7 @@
FROM
t_charging_order
WHERE
- `status` = 4 and order_source = 1
+ `status` = 4
AND NOW() >= ADDDATE(end_time, INTERVAL 10 MINUTE )
AND del_flag = 0
AND id NOT IN (
@@ -2057,7 +2342,7 @@
t_charging_order
WHERE
`status` = 3
- AND del_flag = 0 and order_source = 1
+ AND del_flag = 0
AND id NOT IN (
SELECT
charging_order_id
@@ -2090,4 +2375,97 @@
FROM
t_charging_order_refund)
</select>
+
+
+ <select id="findUpStatusChargingOrder" resultType="com.ruoyi.order.api.model.TChargingOrder">
+ select * from t_charging_order where `status` in (2, 3, 4) and id IN (
+ SELECT
+ charging_order_id
+ FROM
+ t_charging_order_refund)
+ </select>
+
+
+
+
+
+ <select id="getChargingSettlementBill" resultType="map">
+ select
+ aa.siteId,
+ count(aa.orderId) as orderNum,
+ sum(aa.chargingDuration) as chargingDuration,
+ sum(aa.totalAmount) as totalAmount,
+ sum(aa.couponDeduction) as couponDeduction,
+ sum(aa.platformFee) as platformFee,
+ SUM(aa.tripartiteCommission) as tripartiteCommission,
+ sum(aa.totalElectricity) as totalElectricity,
+ sum(aa.totalElectricityCharge) as totalElectricityCharge,
+ sum(aa.totalServiceFee) as totalServiceFee
+ from (
+ select
+ b.id as orderId,
+ b.site_id as siteId,
+ UNIX_TIMESTAMP(b.end_time) - UNIX_TIMESTAMP(b.start_time) as chargingDuration,
+ b.payment_amount as totalAmount,
+ b.coupon_discount_amount as couponDeduction,
+ (CASE WHEN b.order_source != 2 THEN b.recharge_amount * 0.006 ELSE 0 END) as platformFee,
+ sum((CASE WHEN b.order_source = 2 THEN a.period_service_price * 0.2 ELSE 0 END)) as tripartiteCommission,
+ sum(a.charging_capacity) as totalElectricity,
+ sum(a.period_electric_price) as totalElectricityCharge,
+ sum(a.period_service_price) as totalServiceFee
+ from `charging_pile_order`.t_charging_order_accounting_strategy a
+ left join `charging_pile_order`.t_charging_order b on (a.charging_order_id = b.id)
+ where b.`status` = 5 and b.del_flag = 0
+ <if test="null != dateType and 1 == dateType">
+ and b.start_time between #{startTime} and #{endTime}
+ </if>
+ <if test="null != dateType and 2 == dateType">
+ and b.end_time between #{startTime} and #{endTime}
+ </if>
+ group by orderId,siteId, chargingDuration, totalAmount, couponDeduction, platformFee
+ ) as aa group by aa.siteId order by aa.siteId
+ </select>
+
+
+
+ <select id="getAccountSettlementStatement" resultType="map">
+ select
+ aa.site_id as siteId,
+ aa.recharge_payment_type as rechargePaymentType,
+ sum(aa.recharge_amount) as rechargeAmount,
+ sum(aa.refund_amount) as refundAmount,
+ sum(aa.platformFee) as platformFee,
+ sum(aa.tripartiteCommission) as tripartiteCommission
+ from (
+ select
+ b.id as orderId,
+ b.recharge_payment_type,
+ b.site_id,
+ b.recharge_amount,
+ ifnull(c.refund_amount, 0) as refund_amount,
+ (CASE WHEN b.order_source != 2 THEN b.recharge_amount * 0.006 ELSE 0 END) as platformFee,
+ sum((CASE WHEN b.order_source = 2 THEN a.period_service_price * 0.2 ELSE 0 END)) as tripartiteCommission
+ from t_charging_order_accounting_strategy a
+ left join t_charging_order b on (a.charging_order_id = b.id)
+ left join t_charging_order_refund c on (b.id = c.charging_order_id)
+ where b.`status` = 5 and b.del_flag = 0 and b.recharge_payment_type = #{rechargePaymentType} and b.start_time between #{startTime} and #{endTime}
+ group by orderId,recharge_payment_type,site_id,recharge_amount,refund_amount,platformFee
+ ) as aa group by aa.site_id,aa.recharge_payment_type order by aa.site_id
+ </select>
+
+
+
+ <select id="getSiteChargingCapacity" resultType="map">
+ select b.site_id as siteId, sum(a.charging_capacity) as chargingCapacity
+ from t_charging_order_accounting_strategy a
+ left join t_charging_order b on (a.charging_order_id = b.id)
+ where b.status = 5
+ <if test="null != siteIds and siteIds.size() > 0">
+ and b.site_id in
+ <foreach collection="siteIds" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ group by b.site_id
+ </select>
</mapper>
--
Gitblit v1.7.1