Merge remote-tracking branch 'origin/master'

luodangjia

2024-10-23 7ea47db47d3e039e25531cd511d8d7b1342ccfc0

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml

@@ -92,6 +92,9 @@
        <if test="req.status != null ">
            and t1.status = #{req.status}
        </if>
        <if test="req.orderSource != null and req.orderSource != 1 ">
            and t1.orderSource = #{req.orderSource}
        </if>
        <if test="req.siteId != null ">
            and t1.site_id = #{req.siteId}
        </if>
@@ -108,6 +111,7 @@
            and (t1.end_time between #{endTime1} and #{endTime2})
        </if>
        and t1.del_flag = 0
        order by t1.create_time desc
    </select>
    <select id="payOrderQuery" resultType="com.ruoyi.order.dto.PayOrderDto">
        SELECT o.*,i.phone FROM (SELECT
@@ -873,6 +877,9 @@
        <if test="endTime1 != null and endTime1!=''">
            and (t1.end_time between #{endTime1} and #{endTime2})
        </if>
        AND t1.del_flag = 0
        and t1.start_time IS NOT NULL
        order by t1.create_time desc
    </select>
    <select id="chargingListNoPage" resultType="com.ruoyi.order.api.vo.ChargingOrderListVO">
        select t1.* from t_charging_order t1