From 536939b722a1b09e3c56690b1ae4902be5629493 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Wed, 17 Jan 2024 16:00:48 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B7=BB=E5=8A=A0=E5=BA=94=E8=A1=A5?=
 =?UTF-8?q?=E7=BC=B4=E9=87=91=E9=A2=9D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/pile/domain/OrderBasicInfo.java   |  15 +-
 .../programlogic/AbstractProgramLogic.java    |   3 -
 .../mapper/pile/OrderBasicInfoMapper.xml      | 144 +++++++++++++-----
 3 files changed, 122 insertions(+), 40 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java
index 304842948..d7b35cd23 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java
@@ -1,9 +1,12 @@
 package com.jsowell.pile.domain;
 
-import lombok.*;
-
 import java.math.BigDecimal;
 import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 /**
  * 订单主表
@@ -80,6 +83,9 @@ public class OrderBasicInfo {
      */
     private String startMode;
 
+    /**
+     * 第三方平台类型
+     */
     private String thirdPartyType;
 
     /**
@@ -132,6 +138,11 @@ public class OrderBasicInfo {
      */
     private BigDecimal settleAmount;
 
+    /**
+     * 应补缴金额
+     */
+    private BigDecimal remedialAmount;
+
     /**
      * 充电开始时间
      */
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java
index 289e707d1..7bff64e63 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java
@@ -401,9 +401,6 @@ public abstract class AbstractProgramLogic implements InitializingBean {
                 totalElectricityAmount = orderAmount.subtract(totalServiceAmount);
             }
 
-            // 查询会员折扣
-
-
             // 电费总金额
             orderDetail.setTotalElectricityAmount(totalElectricityAmount);
             // 服务费总金额
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index 25d4f7375..70e27b6ad 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -17,6 +17,7 @@
     <result column="logic_card" jdbcType="VARCHAR" property="logicCard" />
     <result column="vin_code" jdbcType="VARCHAR" property="vinCode" />
     <result column="start_mode" jdbcType="VARCHAR" property="startMode" />
+    <result column="third_party_type" jdbcType="VARCHAR" property="thirdPartyType" />
     <result column="pay_mode" jdbcType="VARCHAR" property="payMode" />
     <result column="pay_status" jdbcType="VARCHAR" property="payStatus" />
     <result column="pay_amount" jdbcType="DECIMAL" property="payAmount" />
@@ -27,6 +28,7 @@
     <result column="group_code" jdbcType="VARCHAR" property="groupCode" />
     <result column="discount_amount" jdbcType="DECIMAL" property="discountAmount" />
     <result column="settle_amount" jdbcType="DECIMAL" property="settleAmount" />
+    <result column="remedial_amount" jdbcType="DECIMAL" property="remedialAmount" />
     <result column="charge_start_time" jdbcType="TIMESTAMP" property="chargeStartTime" />
     <result column="charge_end_time" jdbcType="TIMESTAMP" property="chargeEndTime" />
     <result column="start_type" jdbcType="VARCHAR" property="startType" />
@@ -46,11 +48,11 @@
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, order_code, transaction_code, order_status, member_id, station_id, merchant_id, 
-    pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode, pay_mode, 
-    pay_status, pay_amount, pay_time, plate_number, order_amount, virtual_amount, group_code, 
-    discount_amount, settle_amount, charge_start_time, charge_end_time, start_type, appointment_time, 
-    start_soc, end_soc, reason, settlement_time, refund_amount, refund_status, create_by, 
-    create_time, update_by, update_time, del_flag
+    pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode, third_party_type, 
+    pay_mode, pay_status, pay_amount, pay_time, plate_number, order_amount, virtual_amount, 
+    group_code, discount_amount, settle_amount, remedial_amount, charge_start_time, charge_end_time, 
+    start_type, appointment_time, start_soc, end_soc, reason, settlement_time, refund_amount, 
+    refund_status, create_by, create_time, update_by, update_time, del_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -70,28 +72,30 @@
       member_id, station_id, merchant_id, 
       pile_sn, connector_code, pile_connector_code, 
       logic_card, vin_code, start_mode, 
-      pay_mode, pay_status, pay_amount, 
-      pay_time, plate_number, order_amount, 
-      virtual_amount, group_code, discount_amount, 
-      settle_amount, charge_start_time, charge_end_time, 
-      start_type, appointment_time, start_soc, 
-      end_soc, reason, settlement_time, 
-      refund_amount, refund_status, create_by, 
-      create_time, update_by, update_time, 
-      del_flag)
+      third_party_type, pay_mode, pay_status, 
+      pay_amount, pay_time, plate_number, 
+      order_amount, virtual_amount, group_code, 
+      discount_amount, settle_amount, remedial_amount, 
+      charge_start_time, charge_end_time, start_type, 
+      appointment_time, start_soc, end_soc, 
+      reason, settlement_time, refund_amount, 
+      refund_status, create_by, create_time, 
+      update_by, update_time, del_flag
+      )
     values (#{orderCode,jdbcType=VARCHAR}, #{transactionCode,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, 
       #{memberId,jdbcType=VARCHAR}, #{stationId,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR}, 
       #{pileSn,jdbcType=VARCHAR}, #{connectorCode,jdbcType=VARCHAR}, #{pileConnectorCode,jdbcType=VARCHAR}, 
       #{logicCard,jdbcType=VARCHAR}, #{vinCode,jdbcType=VARCHAR}, #{startMode,jdbcType=VARCHAR}, 
-      #{payMode,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{payAmount,jdbcType=DECIMAL}, 
-      #{payTime,jdbcType=TIMESTAMP}, #{plateNumber,jdbcType=VARCHAR}, #{orderAmount,jdbcType=DECIMAL}, 
-      #{virtualAmount,jdbcType=DECIMAL}, #{groupCode,jdbcType=VARCHAR}, #{discountAmount,jdbcType=DECIMAL}, 
-      #{settleAmount,jdbcType=DECIMAL}, #{chargeStartTime,jdbcType=TIMESTAMP}, #{chargeEndTime,jdbcType=TIMESTAMP}, 
-      #{startType,jdbcType=VARCHAR}, #{appointmentTime,jdbcType=TIMESTAMP}, #{startSoc,jdbcType=VARCHAR}, 
-      #{endSoc,jdbcType=VARCHAR}, #{reason,jdbcType=VARCHAR}, #{settlementTime,jdbcType=TIMESTAMP}, 
-      #{refundAmount,jdbcType=DECIMAL}, #{refundStatus,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{delFlag,jdbcType=CHAR})
+      #{thirdPartyType,jdbcType=VARCHAR}, #{payMode,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, 
+      #{payAmount,jdbcType=DECIMAL}, #{payTime,jdbcType=TIMESTAMP}, #{plateNumber,jdbcType=VARCHAR}, 
+      #{orderAmount,jdbcType=DECIMAL}, #{virtualAmount,jdbcType=DECIMAL}, #{groupCode,jdbcType=VARCHAR}, 
+      #{discountAmount,jdbcType=DECIMAL}, #{settleAmount,jdbcType=DECIMAL}, #{remedialAmount,jdbcType=DECIMAL}, 
+      #{chargeStartTime,jdbcType=TIMESTAMP}, #{chargeEndTime,jdbcType=TIMESTAMP}, #{startType,jdbcType=VARCHAR}, 
+      #{appointmentTime,jdbcType=TIMESTAMP}, #{startSoc,jdbcType=VARCHAR}, #{endSoc,jdbcType=VARCHAR}, 
+      #{reason,jdbcType=VARCHAR}, #{settlementTime,jdbcType=TIMESTAMP}, #{refundAmount,jdbcType=DECIMAL}, 
+      #{refundStatus,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=CHAR}
+      )
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.OrderBasicInfo" useGeneratedKeys="true">
     <!--@mbg.generated-->
@@ -133,6 +137,9 @@
       <if test="startMode != null">
         start_mode,
       </if>
+      <if test="thirdPartyType != null">
+        third_party_type,
+      </if>
       <if test="payMode != null">
         pay_mode,
       </if>
@@ -163,6 +170,9 @@
       <if test="settleAmount != null">
         settle_amount,
       </if>
+      <if test="remedialAmount != null">
+        remedial_amount,
+      </if>
       <if test="chargeStartTime != null">
         charge_start_time,
       </if>
@@ -246,6 +256,9 @@
       <if test="startMode != null">
         #{startMode,jdbcType=VARCHAR},
       </if>
+      <if test="thirdPartyType != null">
+        #{thirdPartyType,jdbcType=VARCHAR},
+      </if>
       <if test="payMode != null">
         #{payMode,jdbcType=VARCHAR},
       </if>
@@ -276,6 +289,9 @@
       <if test="settleAmount != null">
         #{settleAmount,jdbcType=DECIMAL},
       </if>
+      <if test="remedialAmount != null">
+        #{remedialAmount,jdbcType=DECIMAL},
+      </if>
       <if test="chargeStartTime != null">
         #{chargeStartTime,jdbcType=TIMESTAMP},
       </if>
@@ -363,6 +379,9 @@
       <if test="startMode != null">
         start_mode = #{startMode,jdbcType=VARCHAR},
       </if>
+      <if test="thirdPartyType != null">
+        third_party_type = #{thirdPartyType,jdbcType=VARCHAR},
+      </if>
       <if test="payMode != null">
         pay_mode = #{payMode,jdbcType=VARCHAR},
       </if>
@@ -393,6 +412,9 @@
       <if test="settleAmount != null">
         settle_amount = #{settleAmount,jdbcType=DECIMAL},
       </if>
+      <if test="remedialAmount != null">
+        remedial_amount = #{remedialAmount,jdbcType=DECIMAL},
+      </if>
       <if test="chargeStartTime != null">
         charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP},
       </if>
@@ -456,6 +478,7 @@
       logic_card = #{logicCard,jdbcType=VARCHAR},
       vin_code = #{vinCode,jdbcType=VARCHAR},
       start_mode = #{startMode,jdbcType=VARCHAR},
+      third_party_type = #{thirdPartyType,jdbcType=VARCHAR},
       pay_mode = #{payMode,jdbcType=VARCHAR},
       pay_status = #{payStatus,jdbcType=VARCHAR},
       pay_amount = #{payAmount,jdbcType=DECIMAL},
@@ -466,6 +489,7 @@
       group_code = #{groupCode,jdbcType=VARCHAR},
       discount_amount = #{discountAmount,jdbcType=DECIMAL},
       settle_amount = #{settleAmount,jdbcType=DECIMAL},
+      remedial_amount = #{remedialAmount,jdbcType=DECIMAL},
       charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP},
       charge_end_time = #{chargeEndTime,jdbcType=TIMESTAMP},
       start_type = #{startType,jdbcType=VARCHAR},
@@ -547,6 +571,11 @@
           when id = #{item.id,jdbcType=INTEGER} then #{item.startMode,jdbcType=VARCHAR}
         </foreach>
       </trim>
+      <trim prefix="third_party_type = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.thirdPartyType,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
       <trim prefix="pay_mode = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           when id = #{item.id,jdbcType=INTEGER} then #{item.payMode,jdbcType=VARCHAR}
@@ -597,6 +626,11 @@
           when id = #{item.id,jdbcType=INTEGER} then #{item.settleAmount,jdbcType=DECIMAL}
         </foreach>
       </trim>
+      <trim prefix="remedial_amount = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.remedialAmount,jdbcType=DECIMAL}
+        </foreach>
+      </trim>
       <trim prefix="charge_start_time = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           when id = #{item.id,jdbcType=INTEGER} then #{item.chargeStartTime,jdbcType=TIMESTAMP}
@@ -766,6 +800,13 @@
           </if>
         </foreach>
       </trim>
+      <trim prefix="third_party_type = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.thirdPartyType != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.thirdPartyType,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
       <trim prefix="pay_mode = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           <if test="item.payMode != null">
@@ -836,6 +877,13 @@
           </if>
         </foreach>
       </trim>
+      <trim prefix="remedial_amount = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.remedialAmount != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.remedialAmount,jdbcType=DECIMAL}
+          </if>
+        </foreach>
+      </trim>
       <trim prefix="charge_start_time = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           <if test="item.chargeStartTime != null">
@@ -952,20 +1000,22 @@
     insert into order_basic_info
     (order_code, transaction_code, order_status, member_id, station_id, merchant_id, 
       pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode, 
-      pay_mode, pay_status, pay_amount, pay_time, plate_number, order_amount, virtual_amount, 
-      group_code, discount_amount, settle_amount, charge_start_time, charge_end_time, 
-      start_type, appointment_time, start_soc, end_soc, reason, settlement_time, refund_amount, 
-      refund_status, create_by, create_time, update_by, update_time, del_flag)
+      third_party_type, pay_mode, pay_status, pay_amount, pay_time, plate_number, order_amount, 
+      virtual_amount, group_code, discount_amount, settle_amount, remedial_amount, charge_start_time, 
+      charge_end_time, start_type, appointment_time, start_soc, end_soc, reason, settlement_time, 
+      refund_amount, refund_status, create_by, create_time, update_by, update_time, del_flag
+      )
     values
     <foreach collection="list" item="item" separator=",">
       (#{item.orderCode,jdbcType=VARCHAR}, #{item.transactionCode,jdbcType=VARCHAR}, #{item.orderStatus,jdbcType=VARCHAR}, 
         #{item.memberId,jdbcType=VARCHAR}, #{item.stationId,jdbcType=VARCHAR}, #{item.merchantId,jdbcType=VARCHAR}, 
         #{item.pileSn,jdbcType=VARCHAR}, #{item.connectorCode,jdbcType=VARCHAR}, #{item.pileConnectorCode,jdbcType=VARCHAR}, 
         #{item.logicCard,jdbcType=VARCHAR}, #{item.vinCode,jdbcType=VARCHAR}, #{item.startMode,jdbcType=VARCHAR}, 
-        #{item.payMode,jdbcType=VARCHAR}, #{item.payStatus,jdbcType=VARCHAR}, #{item.payAmount,jdbcType=DECIMAL}, 
-        #{item.payTime,jdbcType=TIMESTAMP}, #{item.plateNumber,jdbcType=VARCHAR}, #{item.orderAmount,jdbcType=DECIMAL}, 
-        #{item.virtualAmount,jdbcType=DECIMAL}, #{item.groupCode,jdbcType=VARCHAR}, #{item.discountAmount,jdbcType=DECIMAL}, 
-        #{item.settleAmount,jdbcType=DECIMAL}, #{item.chargeStartTime,jdbcType=TIMESTAMP}, 
+        #{item.thirdPartyType,jdbcType=VARCHAR}, #{item.payMode,jdbcType=VARCHAR}, #{item.payStatus,jdbcType=VARCHAR}, 
+        #{item.payAmount,jdbcType=DECIMAL}, #{item.payTime,jdbcType=TIMESTAMP}, #{item.plateNumber,jdbcType=VARCHAR}, 
+        #{item.orderAmount,jdbcType=DECIMAL}, #{item.virtualAmount,jdbcType=DECIMAL}, #{item.groupCode,jdbcType=VARCHAR}, 
+        #{item.discountAmount,jdbcType=DECIMAL}, #{item.settleAmount,jdbcType=DECIMAL}, 
+        #{item.remedialAmount,jdbcType=DECIMAL}, #{item.chargeStartTime,jdbcType=TIMESTAMP}, 
         #{item.chargeEndTime,jdbcType=TIMESTAMP}, #{item.startType,jdbcType=VARCHAR}, #{item.appointmentTime,jdbcType=TIMESTAMP}, 
         #{item.startSoc,jdbcType=VARCHAR}, #{item.endSoc,jdbcType=VARCHAR}, #{item.reason,jdbcType=VARCHAR}, 
         #{item.settlementTime,jdbcType=TIMESTAMP}, #{item.refundAmount,jdbcType=DECIMAL}, 
@@ -993,6 +1043,7 @@
       logic_card,
       vin_code,
       start_mode,
+      third_party_type,
       pay_mode,
       pay_status,
       pay_amount,
@@ -1003,6 +1054,7 @@
       group_code,
       discount_amount,
       settle_amount,
+      remedial_amount,
       charge_start_time,
       charge_end_time,
       start_type,
@@ -1036,6 +1088,7 @@
       #{logicCard,jdbcType=VARCHAR},
       #{vinCode,jdbcType=VARCHAR},
       #{startMode,jdbcType=VARCHAR},
+      #{thirdPartyType,jdbcType=VARCHAR},
       #{payMode,jdbcType=VARCHAR},
       #{payStatus,jdbcType=VARCHAR},
       #{payAmount,jdbcType=DECIMAL},
@@ -1046,6 +1099,7 @@
       #{groupCode,jdbcType=VARCHAR},
       #{discountAmount,jdbcType=DECIMAL},
       #{settleAmount,jdbcType=DECIMAL},
+      #{remedialAmount,jdbcType=DECIMAL},
       #{chargeStartTime,jdbcType=TIMESTAMP},
       #{chargeEndTime,jdbcType=TIMESTAMP},
       #{startType,jdbcType=VARCHAR},
@@ -1079,6 +1133,7 @@
       logic_card = #{logicCard,jdbcType=VARCHAR},
       vin_code = #{vinCode,jdbcType=VARCHAR},
       start_mode = #{startMode,jdbcType=VARCHAR},
+      third_party_type = #{thirdPartyType,jdbcType=VARCHAR},
       pay_mode = #{payMode,jdbcType=VARCHAR},
       pay_status = #{payStatus,jdbcType=VARCHAR},
       pay_amount = #{payAmount,jdbcType=DECIMAL},
@@ -1089,6 +1144,7 @@
       group_code = #{groupCode,jdbcType=VARCHAR},
       discount_amount = #{discountAmount,jdbcType=DECIMAL},
       settle_amount = #{settleAmount,jdbcType=DECIMAL},
+      remedial_amount = #{remedialAmount,jdbcType=DECIMAL},
       charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP},
       charge_end_time = #{chargeEndTime,jdbcType=TIMESTAMP},
       start_type = #{startType,jdbcType=VARCHAR},
@@ -1149,6 +1205,9 @@
       <if test="startMode != null">
         start_mode,
       </if>
+      <if test="thirdPartyType != null">
+        third_party_type,
+      </if>
       <if test="payMode != null">
         pay_mode,
       </if>
@@ -1179,6 +1238,9 @@
       <if test="settleAmount != null">
         settle_amount,
       </if>
+      <if test="remedialAmount != null">
+        remedial_amount,
+      </if>
       <if test="chargeStartTime != null">
         charge_start_time,
       </if>
@@ -1266,6 +1328,9 @@
       <if test="startMode != null">
         #{startMode,jdbcType=VARCHAR},
       </if>
+      <if test="thirdPartyType != null">
+        #{thirdPartyType,jdbcType=VARCHAR},
+      </if>
       <if test="payMode != null">
         #{payMode,jdbcType=VARCHAR},
       </if>
@@ -1296,6 +1361,9 @@
       <if test="settleAmount != null">
         #{settleAmount,jdbcType=DECIMAL},
       </if>
+      <if test="remedialAmount != null">
+        #{remedialAmount,jdbcType=DECIMAL},
+      </if>
       <if test="chargeStartTime != null">
         #{chargeStartTime,jdbcType=TIMESTAMP},
       </if>
@@ -1383,6 +1451,9 @@
       <if test="startMode != null">
         start_mode = #{startMode,jdbcType=VARCHAR},
       </if>
+      <if test="thirdPartyType != null">
+        third_party_type = #{thirdPartyType,jdbcType=VARCHAR},
+      </if>
       <if test="payMode != null">
         pay_mode = #{payMode,jdbcType=VARCHAR},
       </if>
@@ -1413,6 +1484,9 @@
       <if test="settleAmount != null">
         settle_amount = #{settleAmount,jdbcType=DECIMAL},
       </if>
+      <if test="remedialAmount != null">
+        remedial_amount = #{remedialAmount,jdbcType=DECIMAL},
+      </if>
       <if test="chargeStartTime != null">
         charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP},
       </if>
@@ -1625,12 +1699,12 @@
         and t1.group_code = #{groupCode,jdbcType=VARCHAR}
       </if>
         <!-- 数据范围过滤 -->
-        <!--        &amp;lt;if test="merchantDeptIds != null and merchantDeptIds.size() != 0"&amp;gt;-->
+        <!--        &amp;amp;lt;if test="merchantDeptIds != null and merchantDeptIds.size() != 0"&amp;amp;gt;-->
         <!--            and t3.dept_id in-->
-        <!--            &amp;lt;foreach collection="merchantDeptIds" item="merchantDeptId" open="(" separator="," close=")"&amp;gt;-->
+        <!--            &amp;amp;lt;foreach collection="merchantDeptIds" item="merchantDeptId" open="(" separator="," close=")"&amp;amp;gt;-->
         <!--                #{merchantDeptId}-->
-        <!--            &amp;lt;/foreach&amp;gt;-->
-        <!--        &amp;lt;/if&amp;gt;-->
+        <!--            &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=",">