From 9e7d35d1df3e61b5cfcae57d84f645c47879751c Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Tue, 5 Mar 2024 14:56:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/pile/OrderBasicInfoMapper.xml      | 196 +++++++++---------
 1 file changed, 94 insertions(+), 102 deletions(-)

diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index 4c24e6800..cb31b11d3 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -1613,108 +1613,100 @@
         del_flag
     </sql>
 
-    <select id="selectOrderBasicInfoList" parameterType="com.jsowell.pile.dto.QueryOrderDTO" resultType="com.jsowell.pile.vo.web.OrderListVO">
-        SELECT t1.id                       as id,
-               t1.order_code               as orderCode,
-               t1.transaction_code         as transactionCode,
-               t1.order_status             as orderStatus,
-               t1.member_id                as memberId,
-               t2.nick_name                as nickName,
-               t2.mobile_number            as mobileNumber,
-               t1.station_id               as stationId,
-               t3.station_name             as stationName,
-               t1.pile_sn                  as pileSn,
-               t1.connector_code           as connectorCode,
-               t1.logic_card               as logicCard,
-               t1.vin_code                 as vinCode,
-                t1.plate_number             as plateNumber,
-               t1.start_mode               as startMode,
-                t1.third_party_type        as thirdPartyType,
-               t1.pay_mode                 as payMode,
-               t1.pay_status               as payStatus,
-               t1.pay_amount               as payAmount,
-               t1.pay_time                 as payTime,
-               t1.order_amount             as orderAmount,
-               t1.virtual_amount           as virtualAmount,
-                t1.discount_amount as discountAmount,
-               t1.settle_amount            as settleAmount,
-               t1.settlement_time          as settlementTime,
-               t1.start_soc                as startSoc,
-               t1.end_soc                  as endSoc,
-               t1.charge_start_time        as chargeStartTime,
-               t1.charge_end_time          as chargeEndTime,
-               t1.create_time              as createTime,
-               t4.total_used_electricity   as chargingDegree,
-               t4.total_electricity_amount as totalElectricityAmount,
-               t4.total_service_amount     as totalServiceAmount,
-                t4.sharp_used_electricity as sharpElectricity,
-                t4.peak_used_electricity as peakElectricity,
-                t4.flat_used_electricity as flatElectricity,
-                t4.valley_used_electricity as valleyElectricity
-                <!--t5.payment_institutions     as paymentInstitutions-->
-        from order_basic_info t1
-         left join member_basic_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0'
-         join pile_station_info t3 on t1.station_id = t3.id and t3.del_flag = '0'
-         join order_detail t4 on t4.order_code = t1.order_code and t4.del_flag = '0'
-         <!--left join member_transaction_record t5 on t5.order_code = t1.order_code and action_type = 'forward' and t5.del_flag = '0'-->
-        where t1.del_flag = '0'
-        <if test="pileSn != null and pileSn != ''">
-            and t1.pile_sn = #{pileSn,jdbcType=VARCHAR}
-        </if>
-        <if test="connectorCode != null and connectorCode != ''">
-            and t1.connector_code = #{connectorCode,jdbcType=VARCHAR}
-        </if>
-        <if test="memberId != null and memberId != ''">
-            and t1.member_id = #{memberId,jdbcType=VARCHAR}
-        </if>
-        <if test="orderStatus != null and orderStatus != ''">
-            and t1.order_status = #{orderStatus,jdbcType=VARCHAR}
-        </if>
-        <if test="orderCode != null and orderCode != ''">
-            and t1.order_code = #{orderCode,jdbcType=VARCHAR}
-        </if>
-        <if test="transactionCode != null and transactionCode != ''">
-            and t1.transaction_code = #{transactionCode,jdbcType=VARCHAR}
-        </if>
-        <if test="mobileNumber != null and mobileNumber != ''">
-            and t2.mobile_number = #{mobileNumber,jdbcType=VARCHAR}
-        </if>
-        <if test="stationId != null and stationId != ''">
-            and t1.station_id = #{stationId,jdbcType=VARCHAR}
-        </if>
-        <if test="startTime != null and startTime != ''">
-            and t1.create_time <![CDATA[ >= ]]> #{startTime,jdbcType=VARCHAR}
-        </if>
-        <if test="endTime != null and endTime != ''">
-            and t1.create_time <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR}
-        </if>
-        <if test="startSettleTime != null and startSettleTime != ''">
-            and t1.settlement_time <![CDATA[ >= ]]> #{startSettleTime,jdbcType=VARCHAR}
-        </if>
-        <if test="endSettleTime != null and endSettleTime != ''">
-            and t1.settlement_time <![CDATA[ <= ]]> #{endSettleTime,jdbcType=VARCHAR}
-        </if>
-        <if test="merchantId != null and merchantId != ''">
-            and t1.merchant_id = #{merchantId,jdbcType=VARCHAR}
-        </if>
-      <if test="groupCode != null and groupCode != ''">
-        and t1.group_code = #{groupCode,jdbcType=VARCHAR}
-      </if>
-        <!-- 数据范围过滤 -->
-        <!--        &amp;amp;lt;if test="merchantDeptIds != null and merchantDeptIds.size() != 0"&amp;amp;gt;-->
-        <!--            and t3.dept_id in-->
-        <!--            &amp;amp;lt;foreach collection="merchantDeptIds" item="merchantDeptId" open="(" separator="," close=")"&amp;amp;gt;-->
-        <!--                #{merchantDeptId}-->
-        <!--            &amp;amp;lt;/foreach&amp;amp;gt;-->
-        <!--        &amp;amp;lt;/if&amp;amp;gt;-->
-        <if test="stationDeptIds != null and stationDeptIds.size() != 0">
-            and t3.dept_id in
-            <foreach close=")" collection="stationDeptIds" item="stationDeptId" open="(" separator=",">
-                #{stationDeptId}
-            </foreach>
-        </if>
-        order by t1.create_time desc
-    </select>
+  <select id="selectOrderBasicInfoList" parameterType="com.jsowell.pile.dto.QueryOrderDTO"
+          resultType="com.jsowell.pile.vo.web.OrderListVO">
+    SELECT t1.id                       as id,
+           t1.order_code               as orderCode,
+           t1.transaction_code         as transactionCode,
+           t1.order_status             as orderStatus,
+           t1.member_id                as memberId,
+           t2.nick_name                as nickName,
+           t2.mobile_number            as mobileNumber,
+           t1.station_id               as stationId,
+           t3.station_name             as stationName,
+           t1.pile_sn                  as pileSn,
+           t1.connector_code           as connectorCode,
+           t1.logic_card               as logicCard,
+           t1.vin_code                 as vinCode,
+           t1.plate_number             as plateNumber,
+           t1.start_mode               as startMode,
+           t1.third_party_type         as thirdPartyType,
+           t1.pay_mode                 as payMode,
+           t1.pay_status               as payStatus,
+           t1.pay_amount               as payAmount,
+           t1.pay_time                 as payTime,
+           t1.order_amount             as orderAmount,
+           t1.virtual_amount           as virtualAmount,
+           t1.discount_amount          as discountAmount,
+           t1.settle_amount            as settleAmount,
+           t1.settlement_time          as settlementTime,
+           t1.start_soc                as startSoc,
+           t1.end_soc                  as endSoc,
+           t1.charge_start_time        as chargeStartTime,
+           t1.charge_end_time          as chargeEndTime,
+           t1.create_time              as createTime,
+           t4.total_used_electricity   as chargingDegree,
+           t4.total_electricity_amount as totalElectricityAmount,
+           t4.total_service_amount     as totalServiceAmount,
+           t4.sharp_used_electricity   as sharpElectricity,
+           t4.peak_used_electricity    as peakElectricity,
+           t4.flat_used_electricity    as flatElectricity,
+           t4.valley_used_electricity  as valleyElectricity
+    from order_basic_info t1
+           left join member_basic_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0'
+           join pile_station_info t3 on t1.station_id = t3.id and t3.del_flag = '0'
+           join order_detail t4 on t4.order_code = t1.order_code and t4.del_flag = '0'
+    where t1.del_flag = '0'
+    <if test="pileSn != null and pileSn != ''">
+      and t1.pile_sn = #{pileSn,jdbcType=VARCHAR}
+    </if>
+    <if test="connectorCode != null and connectorCode != ''">
+      and t1.connector_code = #{connectorCode,jdbcType=VARCHAR}
+    </if>
+    <if test="memberId != null and memberId != ''">
+      and t1.member_id = #{memberId,jdbcType=VARCHAR}
+    </if>
+    <if test="orderStatus != null and orderStatus != ''">
+      and t1.order_status = #{orderStatus,jdbcType=VARCHAR}
+    </if>
+    <if test="orderCode != null and orderCode != ''">
+      and t1.order_code = #{orderCode,jdbcType=VARCHAR}
+    </if>
+    <if test="transactionCode != null and transactionCode != ''">
+      and t1.transaction_code = #{transactionCode,jdbcType=VARCHAR}
+    </if>
+    <if test="mobileNumber != null and mobileNumber != ''">
+      and t2.mobile_number = #{mobileNumber,jdbcType=VARCHAR}
+    </if>
+    <if test="stationId != null and stationId != ''">
+      and t1.station_id = #{stationId,jdbcType=VARCHAR}
+    </if>
+    <if test="startTime != null and startTime != ''">
+      and t1.create_time <![CDATA[ >= ]]> #{startTime,jdbcType=VARCHAR}
+    </if>
+    <if test="endTime != null and endTime != ''">
+      and t1.create_time <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR}
+    </if>
+    <if test="startSettleTime != null and startSettleTime != ''">
+      and t1.settlement_time <![CDATA[ >= ]]> #{startSettleTime,jdbcType=VARCHAR}
+    </if>
+    <if test="endSettleTime != null and endSettleTime != ''">
+      and t1.settlement_time <![CDATA[ <= ]]> #{endSettleTime,jdbcType=VARCHAR}
+    </if>
+    <if test="merchantId != null and merchantId != ''">
+      and t1.merchant_id = #{merchantId,jdbcType=VARCHAR}
+    </if>
+    <if test="groupCode != null and groupCode != ''">
+      and t1.group_code = #{groupCode,jdbcType=VARCHAR}
+    </if>
+    <if test="stationDeptIds != null and stationDeptIds.size() != 0">
+      and t3.dept_id in
+      <foreach close=")" collection="stationDeptIds" item="stationDeptId" open="(" separator=",">
+        #{stationDeptId}
+      </foreach>
+    </if>
+    order by t1.create_time desc
+  </select>
 
     <select id="getOrderTotalData" parameterType="com.jsowell.pile.dto.QueryOrderDTO" resultType="com.jsowell.pile.vo.web.OrderTotalDataVO">
         select