Merge branch 'dev-new' into dev-new-rabbitmq

# Conflicts: # jsowell-admin/src/test/java/PaymentTestController.java
2026-04-20 11:05:18 +08:00 · 2024-12-19 13:30:11 +08:00
parent 6e2b20d21a f0f0482ffd
commit fdad5e218c
64 changed files with 2858 additions and 767 deletions
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -36,6 +36,7 @@
    <result column="reserved_end_time" jdbcType="TIMESTAMP" property="reservedEndTime" />
    <result column="start_soc" jdbcType="VARCHAR" property="startSoc" />
    <result column="end_soc" jdbcType="VARCHAR" property="endSoc" />
+    <result column="stop_reason_code" jdbcType="VARCHAR" property="stopReasonCode" />
    <result column="reason" jdbcType="VARCHAR" property="reason" />
    <result column="settlement_time" jdbcType="TIMESTAMP" property="settlementTime" />
    <result column="refund_amount" jdbcType="DECIMAL" property="refundAmount" />
@@ -52,7 +53,7 @@
    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, reserved_start_time, reserved_end_time, start_soc, end_soc, reason, settlement_time, refund_amount,
+    start_type, reserved_start_time, reserved_end_time, start_soc, end_soc, stop_reason_code, 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">
@@ -79,7 +80,7 @@
      discount_amount, settle_amount, remedial_amount, 
      charge_start_time, charge_end_time, start_type,
      reserved_start_time, reserved_end_time,
-      start_soc, end_soc,
+      start_soc, end_soc, stop_reason_code,
      reason, settlement_time, refund_amount, 
      refund_status, create_by, create_time, 
      update_by, update_time, del_flag
@@ -94,7 +95,7 @@
      #{discountAmount,jdbcType=DECIMAL}, #{settleAmount,jdbcType=DECIMAL}, #{remedialAmount,jdbcType=DECIMAL}, 
      #{chargeStartTime,jdbcType=TIMESTAMP}, #{chargeEndTime,jdbcType=TIMESTAMP}, #{startType,jdbcType=VARCHAR},
      #{reservedStartTime,jdbcType=TIMESTAMP},#{reservedEndTime,jdbcType=TIMESTAMP},
-      #{startSoc,jdbcType=VARCHAR}, #{endSoc,jdbcType=VARCHAR},
+      #{startSoc,jdbcType=VARCHAR}, #{endSoc,jdbcType=VARCHAR}, #{stopReasonCode,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}
@@ -197,6 +198,9 @@
      <if test="endSoc != null">
        end_soc,
      </if>
+      <if test="stopReasonCode != null">
+        stop_reason_code,,
+      </if>
      <if test="reason != null">
        reason,
      </if>
@@ -319,6 +323,9 @@
      <if test="endSoc != null">
        #{endSoc,jdbcType=VARCHAR},
      </if>
+      <if test="stopReasonCode != null">
+        #{stopReasonCode,jdbcType=VARCHAR},
+      </if>
      <if test="reason != null">
        #{reason,jdbcType=VARCHAR},
      </if>
@@ -445,6 +452,9 @@
      <if test="endSoc != null">
        end_soc = #{endSoc,jdbcType=VARCHAR},
      </if>
+      <if test="stopReasonCode != null">
+        stop_reason_code = #{stopReasonCode,jdbcType=VARCHAR},
+      </if>
      <if test="reason != null">
        reason = #{reason,jdbcType=VARCHAR},
      </if>
@@ -509,6 +519,7 @@
      reserved_end_time = #{reservedEndTime,jdbcType=TIMESTAMP},
      start_soc = #{startSoc,jdbcType=VARCHAR},
      end_soc = #{endSoc,jdbcType=VARCHAR},
+      stop_reason_code = #{stopReasonCode,jdbcType=VARCHAR},
      reason = #{reason,jdbcType=VARCHAR},
      settlement_time = #{settlementTime,jdbcType=TIMESTAMP},
      refund_amount = #{refundAmount,jdbcType=DECIMAL},
@@ -679,6 +690,11 @@
          when id = #{item.id,jdbcType=INTEGER} then #{item.endSoc,jdbcType=VARCHAR}
        </foreach>
      </trim>
+      <trim prefix="stop_reason_code = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.stopReasonCode,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
      <trim prefix="reason = case" suffix="end,">
        <foreach collection="list" index="index" item="item">
          when id = #{item.id,jdbcType=INTEGER} then #{item.reason,jdbcType=VARCHAR}
@@ -951,6 +967,13 @@
          </if>
        </foreach>
      </trim>
+      <trim prefix="stop_reason_code = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.stopReasonCode != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.stopReasonCode,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
      <trim prefix="reason = case" suffix="end,">
        <foreach collection="list" index="index" item="item">
          <if test="item.reason != null">
@@ -1027,7 +1050,7 @@
      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, reserved_start_time, reserved_end_time, start_soc, end_soc, reason, settlement_time,
+      charge_end_time, start_type, reserved_start_time, reserved_end_time, start_soc, end_soc, stop_reason_code, reason, settlement_time,
      refund_amount, refund_status, create_by, create_time, update_by, update_time, del_flag
      )
    values
@@ -1043,7 +1066,7 @@
        #{item.remedialAmount,jdbcType=DECIMAL}, #{item.chargeStartTime,jdbcType=TIMESTAMP}, 
        #{item.chargeEndTime,jdbcType=TIMESTAMP}, #{item.startType,jdbcType=VARCHAR}, #{item.reservedStartTime,jdbcType=TIMESTAMP},
      #{item.reservedEndTime,jdbcType=TIMESTAMP},
-        #{item.startSoc,jdbcType=VARCHAR}, #{item.endSoc,jdbcType=VARCHAR}, #{item.reason,jdbcType=VARCHAR}, 
+        #{item.startSoc,jdbcType=VARCHAR}, #{item.endSoc,jdbcType=VARCHAR}, #{item.stopReasonCode,jdbcType=VARCHAR}, #{item.reason,jdbcType=VARCHAR},
        #{item.settlementTime,jdbcType=TIMESTAMP}, #{item.refundAmount,jdbcType=DECIMAL}, 
        #{item.refundStatus,jdbcType=VARCHAR}, #{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
        #{item.updateBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.delFlag,jdbcType=CHAR}
@@ -1088,6 +1111,7 @@
      reserved_end_time,
      start_soc,
      end_soc,
+      stop_reason_code,
      reason,
      settlement_time,
      refund_amount,
@@ -1134,6 +1158,7 @@
      #{reservedEndTime,jdbcType=TIMESTAMP},
      #{startSoc,jdbcType=VARCHAR},
      #{endSoc,jdbcType=VARCHAR},
+      #{stopReasonCode,jdbcType=VARCHAR},
      #{reason,jdbcType=VARCHAR},
      #{settlementTime,jdbcType=TIMESTAMP},
      #{refundAmount,jdbcType=DECIMAL},
@@ -1180,6 +1205,7 @@
      reserved_end_time = #{reservedEndTime,jdbcType=TIMESTAMP},
      start_soc = #{startSoc,jdbcType=VARCHAR},
      end_soc = #{endSoc,jdbcType=VARCHAR},
+      stop_reason_code = {stopReasonCode,jdbcType=VARCHAR},
      reason = #{reason,jdbcType=VARCHAR},
      settlement_time = #{settlementTime,jdbcType=TIMESTAMP},
      refund_amount = #{refundAmount,jdbcType=DECIMAL},
@@ -1291,6 +1317,9 @@
      <if test="endSoc != null">
        end_soc,
      </if>
+      <if test="stopReasonCode != null">
+        stop_reason_code,
+      </if>
      <if test="reason != null">
        reason,
      </if>
@@ -1417,6 +1446,9 @@
      <if test="endSoc != null">
        #{endSoc,jdbcType=VARCHAR},
      </if>
+      <if test="stopReasonCode != null">
+        #{stopReasonCode,jdbcType=VARCHAR},
+      </if>
      <if test="reason != null">
        #{reason,jdbcType=VARCHAR},
      </if>
@@ -1543,6 +1575,9 @@
      <if test="endSoc != null">
        end_soc = #{endSoc,jdbcType=VARCHAR},
      </if>
+      <if test="stopReasonCode != null">
+        stop_reason_code = #{stopReasonCode,jdbcType=VARCHAR},
+      </if>
      <if test="reason != null">
        reason = #{reason,jdbcType=VARCHAR},
      </if>
@@ -1949,6 +1984,9 @@
            <if test="endSoc != null">
                end_soc,
            </if>
+          <if test="stopReasonCode != null">
+            stop_reason_code,
+          </if>
            <if test="reason != null">
                reason,
            </if>
@@ -2059,6 +2097,9 @@
            <if test="endSoc != null">
              #{endSoc},
            </if>
+          <if test="stopReasonCode != null">
+            #{stopReasonCode},
+          </if>
            <if test="reason != null">
                #{reason},
            </if>
@@ -2170,6 +2211,9 @@
            <if test="endSoc != null">
              end_soc = #{endSoc},
            </if>
+          <if test="stopReasonCode != null">
+            stop_reason_code = #{stopReasonCode},
+          </if>
            <if test="reason != null">
                reason = #{reason},
            </if>
@@ -2389,6 +2433,7 @@
               t1.order_code               as orderCode,
                t1.transaction_code as transactionCode,
               t1.order_status             as orderStatus,
+                t1.stop_reason_code as stopReasonCode,
               t1.reason,
               t1.station_id               as stationId,
               t3.station_name             as stationName,
@@ -3026,4 +3071,13 @@
    limit 20
  </select>

+  <select id="tempGetOrderCodes" resultType="java.lang.String">
+    select
+      order_code
+    from
+      order_basic_info
+    where
+      station_id = #{stationId,jdbcType=VARCHAR}
+    and create_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+    </select>
 </mapper>
--- a/jsowell-pile/src/main/resources/mapper/pile/PersonalChargingRecordMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PersonalChargingRecordMapper.xml
@@ -31,6 +31,7 @@
    <result column="peak_used_electricity" jdbcType="DECIMAL" property="peakUsedElectricity" />
    <result column="flat_used_electricity" jdbcType="DECIMAL" property="flatUsedElectricity" />
    <result column="valley_used_electricity" jdbcType="DECIMAL" property="valleyUsedElectricity" />
+    <result column="stop_reason_code" jdbcType="VARCHAR" property="stopReasonCode" />
    <result column="reason" jdbcType="VARCHAR" property="reason" />
    <result column="trade_date" jdbcType="TIMESTAMP" property="tradeDate" />
    <result column="source_type" jdbcType="VARCHAR" property="sourceType" />
@@ -46,7 +47,7 @@
    pile_connector_code, logic_card, vin_code, start_mode, plate_number, charge_start_time, 
    charge_end_time, start_type, reservation_start_time, reservation_end_time, start_soc, 
    end_soc, ammeter_total_start, ammeter_total_end, total_used_electricity, sharp_used_electricity, 
-    peak_used_electricity, flat_used_electricity, valley_used_electricity, reason, trade_date, 
+    peak_used_electricity, flat_used_electricity, valley_used_electricity, stop_reason_code, reason, trade_date,
    source_type, create_by, create_time, update_by, update_time, del_flag
  </sql>
  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -72,7 +73,7 @@
      start_soc, end_soc, ammeter_total_start, 
      ammeter_total_end, total_used_electricity, 
      sharp_used_electricity, peak_used_electricity, 
-      flat_used_electricity, valley_used_electricity, 
+      flat_used_electricity, valley_used_electricity, stop_reason_code,
      reason, trade_date, source_type, 
      create_by, create_time, update_by, 
      update_time, del_flag)
@@ -85,7 +86,7 @@
      #{startSoc,jdbcType=VARCHAR}, #{endSoc,jdbcType=VARCHAR}, #{ammeterTotalStart,jdbcType=VARCHAR}, 
      #{ammeterTotalEnd,jdbcType=VARCHAR}, #{totalUsedElectricity,jdbcType=DECIMAL}, 
      #{sharpUsedElectricity,jdbcType=DECIMAL}, #{peakUsedElectricity,jdbcType=DECIMAL}, 
-      #{flatUsedElectricity,jdbcType=DECIMAL}, #{valleyUsedElectricity,jdbcType=DECIMAL}, 
+      #{flatUsedElectricity,jdbcType=DECIMAL}, #{valleyUsedElectricity,jdbcType=DECIMAL}, #{stopReasonCode,jdbcType=VARCHAR},
      #{reason,jdbcType=VARCHAR}, #{tradeDate,jdbcType=TIMESTAMP}, #{sourceType,jdbcType=VARCHAR}, 
      #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
      #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=CHAR})
@@ -172,6 +173,9 @@
      <if test="valleyUsedElectricity != null">
        valley_used_electricity,
      </if>
+      <if test="stopReasonCode != null">
+        stop_reason_code,
+      </if>
      <if test="reason != null">
        reason,
      </if>
@@ -276,6 +280,9 @@
      <if test="valleyUsedElectricity != null">
        #{valleyUsedElectricity,jdbcType=DECIMAL},
      </if>
+      <if test="stopReasonCode != null">
+        #{stopReasonCode,jdbcType=VARCHAR},
+      </if>
      <if test="reason != null">
        #{reason,jdbcType=VARCHAR},
      </if>
@@ -384,6 +391,9 @@
      <if test="valleyUsedElectricity != null">
        valley_used_electricity = #{valleyUsedElectricity,jdbcType=DECIMAL},
      </if>
+      <if test="stopReasonCode != null">
+        stop_reason_code = #{stopReasonCode,jdbcType=VARCHAR},
+      </if>
      <if test="reason != null">
        reason = #{reason,jdbcType=VARCHAR},
      </if>
@@ -440,6 +450,7 @@
      peak_used_electricity = #{peakUsedElectricity,jdbcType=DECIMAL},
      flat_used_electricity = #{flatUsedElectricity,jdbcType=DECIMAL},
      valley_used_electricity = #{valleyUsedElectricity,jdbcType=DECIMAL},
+      stop_reason_code = #{stopReasonCode,jdbcType=VARCHAR},
      reason = #{reason,jdbcType=VARCHAR},
      trade_date = #{tradeDate,jdbcType=TIMESTAMP},
      source_type = #{sourceType,jdbcType=VARCHAR},
@@ -584,6 +595,11 @@
          when id = #{item.id,jdbcType=INTEGER} then #{item.valleyUsedElectricity,jdbcType=DECIMAL}
        </foreach>
      </trim>
+      <trim prefix="stop_reason_code = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.stopReasonCode,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
      <trim prefix="reason = case" suffix="end,">
        <foreach collection="list" index="index" item="item">
          when id = #{item.id,jdbcType=INTEGER} then #{item.reason,jdbcType=VARCHAR}
@@ -816,6 +832,13 @@
          </if>
        </foreach>
      </trim>
+      <trim prefix="stop_reason_code = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.stopReasonCode != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.stopReasonCode,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
      <trim prefix="reason = case" suffix="end,">
        <foreach collection="list" index="index" item="item">
          <if test="item.reason != null">
@@ -885,7 +908,7 @@
      pile_connector_code, logic_card, vin_code, start_mode, plate_number, charge_start_time, 
      charge_end_time, start_type, reservation_start_time, reservation_end_time, start_soc, 
      end_soc, ammeter_total_start, ammeter_total_end, total_used_electricity, sharp_used_electricity, 
-      peak_used_electricity, flat_used_electricity, valley_used_electricity, reason, 
+      peak_used_electricity, flat_used_electricity, valley_used_electricity, stop_reason_code, reason,
      trade_date, source_type, create_by, create_time, update_by, update_time, del_flag
      )
    values
@@ -900,7 +923,7 @@
        #{item.endSoc,jdbcType=VARCHAR}, #{item.ammeterTotalStart,jdbcType=VARCHAR}, #{item.ammeterTotalEnd,jdbcType=VARCHAR}, 
        #{item.totalUsedElectricity,jdbcType=DECIMAL}, #{item.sharpUsedElectricity,jdbcType=DECIMAL}, 
        #{item.peakUsedElectricity,jdbcType=DECIMAL}, #{item.flatUsedElectricity,jdbcType=DECIMAL}, 
-        #{item.valleyUsedElectricity,jdbcType=DECIMAL}, #{item.reason,jdbcType=VARCHAR}, 
+        #{item.valleyUsedElectricity,jdbcType=DECIMAL}, #{item.stopReasonCode,jdbcType=VARCHAR}, #{item.reason,jdbcType=VARCHAR},
        #{item.tradeDate,jdbcType=TIMESTAMP}, #{item.sourceType,jdbcType=VARCHAR}, #{item.createBy,jdbcType=VARCHAR}, 
        #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
        #{item.delFlag,jdbcType=CHAR})
@@ -939,6 +962,7 @@
      peak_used_electricity,
      flat_used_electricity,
      valley_used_electricity,
+      stop_reason_code,
      reason,
      trade_date,
      source_type,
@@ -979,6 +1003,7 @@
      #{peakUsedElectricity,jdbcType=DECIMAL},
      #{flatUsedElectricity,jdbcType=DECIMAL},
      #{valleyUsedElectricity,jdbcType=DECIMAL},
+      #{stopReasonCode,jdbcType=VARCHAR},
      #{reason,jdbcType=VARCHAR},
      #{tradeDate,jdbcType=TIMESTAMP},
      #{sourceType,jdbcType=VARCHAR},
@@ -1019,6 +1044,7 @@
      peak_used_electricity = #{peakUsedElectricity,jdbcType=DECIMAL},
      flat_used_electricity = #{flatUsedElectricity,jdbcType=DECIMAL},
      valley_used_electricity = #{valleyUsedElectricity,jdbcType=DECIMAL},
+      stop_reason_code = #{stopReasonCode,jdbcType=VARCHAR},
      reason = #{reason,jdbcType=VARCHAR},
      trade_date = #{tradeDate,jdbcType=TIMESTAMP},
      source_type = #{sourceType,jdbcType=VARCHAR},
@@ -1114,6 +1140,9 @@
      <if test="valleyUsedElectricity != null">
        valley_used_electricity,
      </if>
+      <if test="stopReasonCode != null">
+        stop_reason_code,
+      </if>
      <if test="reason != null">
        reason,
      </if>
@@ -1222,6 +1251,9 @@
      <if test="valleyUsedElectricity != null">
        #{valleyUsedElectricity,jdbcType=DECIMAL},
      </if>
+      <if test="stopReasonCode != null">
+        #{stopReasonCode,jdbcType=VARCHAR},
+      </if>
      <if test="reason != null">
        #{reason,jdbcType=VARCHAR},
      </if>
@@ -1330,6 +1362,9 @@
      <if test="valleyUsedElectricity != null">
        valley_used_electricity = #{valleyUsedElectricity,jdbcType=DECIMAL},
      </if>
+      <if test="stopReasonCode != null">
+        stop_reason_code = #{stopReasonCode,jdbcType=VARCHAR},
+      </if>
      <if test="reason != null">
        reason = #{reason,jdbcType=VARCHAR},
      </if>