autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

订单主表中新增 实收金额字段

Browse Source
This commit is contained in:
Lemon
2025-05-12 09:17:24 +08:00
parent 7f65bf6822
commit 34975d28cf
3 changed files with 58 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
View File

@@ -28,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="actual_received_amount" jdbcType="DECIMAL" property="actualReceivedAmount"/>
<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"/>
@@ -52,7 +53,7 @@
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, 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,
group_code, discount_amount, settle_amount, actual_received_amount, remedial_amount, charge_start_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
@@ -79,7 +80,7 @@
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,
discount_amount, settle_amount, actual_received_amount, remedial_amount,
charge_start_time, charge_end_time, start_type,
reserved_start_time, reserved_end_time,
start_soc, end_soc, stop_reason_code,
@@ -94,7 +95,7 @@
#{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},
#{discountAmount,jdbcType=DECIMAL}, #{settleAmount,jdbcType=DECIMAL}, #{actualReceivedAmount,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}, #{stopReasonCode,jdbcType=VARCHAR},
@@ -177,6 +178,9 @@
<if test="settleAmount != null">
settle_amount,
</if>
<if test="actualReceivedAmount != null">
actual_received_amount,
</if>
<if test="remedialAmount != null">
remedial_amount,
</if>
@@ -302,6 +306,9 @@
<if test="settleAmount != null">
#{settleAmount,jdbcType=DECIMAL},
</if>
<if test="actualReceivedAmount != null">
#{actualReceivedAmount,jdbcType=DECIMAL},
</if>
<if test="remedialAmount != null">
#{remedialAmount,jdbcType=DECIMAL},
</if>
@@ -431,6 +438,9 @@
<if test="settleAmount != null">
settle_amount = #{settleAmount,jdbcType=DECIMAL},
</if>
<if test="actualReceivedAmount != null">
actual_received_amount = #{actualReceivedAmount,jdbcType=DECIMAL},
</if>
<if test="remedialAmount != null">
remedial_amount = #{remedialAmount,jdbcType=DECIMAL},
</if>
@@ -514,6 +524,7 @@
group_code = #{groupCode,jdbcType=VARCHAR},
discount_amount = #{discountAmount,jdbcType=DECIMAL},
settle_amount = #{settleAmount,jdbcType=DECIMAL},
actual_received_amount = #{actualReceivedAmount,jdbcType=DECIMAL},
remedial_amount = #{remedialAmount,jdbcType=DECIMAL},
charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP},
charge_end_time = #{chargeEndTime,jdbcType=TIMESTAMP},
@@ -653,6 +664,11 @@
when id = #{item.id,jdbcType=INTEGER} then #{item.settleAmount,jdbcType=DECIMAL}
</foreach>
</trim>
<trim prefix="actual_received_amount = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.actualReceivedAmount,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}
@@ -914,6 +930,13 @@
</if>
</foreach>
</trim>
<trim prefix="actual_received_amount = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.actualReceivedAmount != null">
when id = #{item.id,jdbcType=INTEGER} then #{item.actualReceivedAmount,jdbcType=DECIMAL}
</if>
</foreach>
</trim>
<trim prefix="remedial_amount = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.remedialAmount != null">
@@ -1052,7 +1075,7 @@
(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,
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,
virtual_amount, group_code, discount_amount, settle_amount, actual_received_amount, remedial_amount, charge_start_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
@@ -1072,6 +1095,7 @@
#{item.orderAmount,jdbcType=DECIMAL}, #{item.virtualAmount,jdbcType=DECIMAL},
#{item.groupCode,jdbcType=VARCHAR},
#{item.discountAmount,jdbcType=DECIMAL}, #{item.settleAmount,jdbcType=DECIMAL},
#{item.actualReceivedAmount,jdbcType=DECIMAL},
#{item.remedialAmount,jdbcType=DECIMAL}, #{item.chargeStartTime,jdbcType=TIMESTAMP},
#{item.chargeEndTime,jdbcType=TIMESTAMP}, #{item.startType,jdbcType=VARCHAR},
#{item.reservedStartTime,jdbcType=TIMESTAMP},
@@ -1116,6 +1140,7 @@
group_code,
discount_amount,
settle_amount,
actual_received_amount,
remedial_amount,
charge_start_time,
charge_end_time,
@@ -1163,6 +1188,7 @@
#{groupCode,jdbcType=VARCHAR},
#{discountAmount,jdbcType=DECIMAL},
#{settleAmount,jdbcType=DECIMAL},
#{actualReceivedAmount,jdbcType=DECIMAL},
#{remedialAmount,jdbcType=DECIMAL},
#{chargeStartTime,jdbcType=TIMESTAMP},
#{chargeEndTime,jdbcType=TIMESTAMP},
@@ -1210,6 +1236,7 @@
group_code = #{groupCode,jdbcType=VARCHAR},
discount_amount = #{discountAmount,jdbcType=DECIMAL},
settle_amount = #{settleAmount,jdbcType=DECIMAL},
actual_received_amount = #{actualReceivedAmount,jdbcType=DECIMAL},
remedial_amount = #{remedialAmount,jdbcType=DECIMAL},
charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP},
charge_end_time = #{chargeEndTime,jdbcType=TIMESTAMP},
@@ -1307,6 +1334,9 @@
<if test="settleAmount != null">
settle_amount,
</if>
<if test="actualReceivedAmount != null">
actual_received_amount,
</if>
<if test="remedialAmount != null">
remedial_amount,
</if>
@@ -1436,6 +1466,9 @@
<if test="settleAmount != null">
#{settleAmount,jdbcType=DECIMAL},
</if>
<if test="actualReceivedAmount != null">
#{actualReceivedAmount,jdbcType=DECIMAL},
</if>
<if test="remedialAmount != null">
#{remedialAmount,jdbcType=DECIMAL},
</if>
@@ -1565,6 +1598,9 @@
<if test="settleAmount != null">
settle_amount = #{settleAmount,jdbcType=DECIMAL},
</if>
<if test="actualReceivedAmount != null">
actual_received_amount = #{actualReceivedAmount,jdbcType=DECIMAL},
</if>
<if test="remedialAmount != null">
remedial_amount = #{remedialAmount,jdbcType=DECIMAL},
</if>
@@ -1981,6 +2017,9 @@
<if test="settleAmount != null">
settle_amount,
</if>
<if test="actualReceivedAmount != null">
actual_received_amount,
</if>
<if test="chargeStartTime != null">
charge_start_time,
</if>
@@ -2094,6 +2133,9 @@
<if test="settleAmount != null">
#{settleAmount},
</if>
<if test="actualReceivedAmount != null">
#{actualReceivedAmount},
</if>
<if test="chargeStartTime != null">
#{chargeStartTime},
</if>
@@ -2214,6 +2256,9 @@
<if test="settleAmount != null">
settle_amount = #{settleAmount},
</if>
<if test="actualReceivedAmount != null">
actual_received_amount = #{actualReceivedAmount},
</if>
<if test="chargeStartTime != null">
charge_start_time = #{chargeStartTime},
</if>