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

Merge branch 'dev-zza' into dev

Browse Source
This commit is contained in:
Lemon
2025-06-25 15:38:57 +08:00
parent 029913d03b 1e178d6890
commit fd527e0467
20 changed files with 755 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,9 @@
<result column="order_code" jdbcType="VARCHAR" property="orderCode"/>
<result column="transaction_code" jdbcType="VARCHAR" property="transactionCode"/>
<result column="order_status" jdbcType="VARCHAR" property="orderStatus"/>
<result column="order_type" jdbcType="VARCHAR" property="orderType"/>
<result column="merge_charge_number" jdbcType="VARCHAR" property="mergeChargeNumber"/>
<result column="main_connector_code" jdbcType="VARCHAR" property="mainConnectorCode"/>
<result column="member_id" jdbcType="VARCHAR" property="memberId"/>
<result column="station_id" jdbcType="VARCHAR" property="stationId"/>
<result column="merchant_id" jdbcType="VARCHAR" property="merchantId"/>
@@ -50,7 +53,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, order_code, transaction_code, order_status, member_id, station_id, merchant_id,
id, order_code, transaction_code, order_status, order_type, merge_charge_number, main_connector_code, 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, actual_received_amount, remedial_amount, charge_start_time, charge_end_time,
@@ -73,7 +76,7 @@
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.OrderBasicInfo"
useGeneratedKeys="true">
<!--@mbg.generated-->
insert into order_basic_info (order_code, transaction_code, order_status,
insert into order_basic_info (order_code, transaction_code, order_status, order_type, merge_charge_number, main_connector_code,
member_id, station_id, merchant_id,
pile_sn, connector_code, pile_connector_code,
logic_card, vin_code, start_mode,
@@ -89,6 +92,7 @@
update_by, update_time, del_flag
)
values (#{orderCode,jdbcType=VARCHAR}, #{transactionCode,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR},
#{orderType,jdbcType=VARCHAR}, #{mergeChargeNumber,jdbcType=VARCHAR}, #{mainConnectorCode,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},
@@ -118,6 +122,15 @@
<if test="orderStatus != null">
order_status,
</if>
<if test="orderType != null">
order_type,
</if>
<if test="mergeChargeNumber != null">
merge_charge_number,
</if>
<if test="mainConnectorCode != null">
main_connector_code,
</if>
<if test="memberId != null">
member_id,
</if>
@@ -246,6 +259,15 @@
<if test="orderStatus != null">
#{orderStatus,jdbcType=VARCHAR},
</if>
<if test="orderType != null">
#{orderType,jdbcType=VARCHAR},
</if>
<if test="mergeChargeNumber != null">
#{mergeChargeNumber,jdbcType=VARCHAR},
</if>
<if test="mainConnectorCode != null">
#{mainConnectorCode,jdbcType=VARCHAR},
</if>
<if test="memberId != null">
#{memberId,jdbcType=VARCHAR},
</if>
@@ -378,6 +400,15 @@
<if test="orderStatus != null">
order_status = #{orderStatus,jdbcType=VARCHAR},
</if>
<if test="orderType != null">
order_type = #{orderType,jdbcType=VARCHAR},
</if>
<if test="mergeChargeNumber != null">
merge_charge_number = #{mergeChargeNumber,jdbcType=VARCHAR},
</if>
<if test="mainConnectorCode != null">
main_connector_code = #{mainConnectorCode,jdbcType=VARCHAR},
</if>
<if test="memberId != null">
member_id = #{memberId,jdbcType=VARCHAR},
</if>
@@ -504,6 +535,9 @@
set order_code = #{orderCode,jdbcType=VARCHAR},
transaction_code = #{transactionCode,jdbcType=VARCHAR},
order_status = #{orderStatus,jdbcType=VARCHAR},
order_type = #{orderType,jdbcType=VARCHAR},
merge_charge_number = #{mergeChargeNumber,jdbcType=VARCHAR},
main_connector_code = #{mainConnectorCode,jdbcType=VARCHAR},
member_id = #{memberId,jdbcType=VARCHAR},
station_id = #{stationId,jdbcType=VARCHAR},
merchant_id = #{merchantId,jdbcType=VARCHAR},
@@ -564,6 +598,21 @@
when id = #{item.id,jdbcType=INTEGER} then #{item.orderStatus,jdbcType=VARCHAR}
</foreach>
</trim>
<trim prefix="order_type = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.orderType,jdbcType=VARCHAR}
</foreach>
</trim>
<trim prefix="merge_charge_number = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.mergeChargeNumber,jdbcType=VARCHAR}
</foreach>
</trim>
<trim prefix="main_connector_code = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.mainConnectorCode,jdbcType=VARCHAR}
</foreach>
</trim>
<trim prefix="member_id = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.memberId,jdbcType=VARCHAR}
@@ -790,6 +839,27 @@
</if>
</foreach>
</trim>
<trim prefix="order_type = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.orderType != null">
when id = #{item.id,jdbcType=INTEGER} then #{item.orderType,jdbcType=VARCHAR}
</if>
</foreach>
</trim>
<trim prefix="merge_charge_number = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.mergeChargeNumber != null">
when id = #{item.id,jdbcType=INTEGER} then #{item.mergeChargeNumber,jdbcType=VARCHAR}
</if>
</foreach>
</trim>
<trim prefix="main_connector_code = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.mainConnectorCode != null">
when id = #{item.id,jdbcType=INTEGER} then #{item.mainConnectorCode,jdbcType=VARCHAR}
</if>
</foreach>
</trim>
<trim prefix="member_id = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.memberId != null">
@@ -1072,7 +1142,7 @@
<insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into order_basic_info
(order_code, transaction_code, order_status, member_id, station_id, merchant_id,
(order_code, transaction_code, order_status, order_type, merge_charge_number, main_connector_code, 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, actual_received_amount, remedial_amount, charge_start_time,
@@ -1083,7 +1153,7 @@
values
<foreach collection="list" item="item" separator=",">
(#{item.orderCode,jdbcType=VARCHAR}, #{item.transactionCode,jdbcType=VARCHAR},
#{item.orderStatus,jdbcType=VARCHAR},
#{item.orderStatus,jdbcType=VARCHAR}, #{item.orderType,jdbcType=VARCHAR}, #{item.mergeChargeNumber,jdbcType=VARCHAR}, #{item.mainConnectorCode,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},
@@ -1120,6 +1190,9 @@
order_code,
transaction_code,
order_status,
order_type,
merge_charge_number,
main_connector_code,
member_id,
station_id,
merchant_id,
@@ -1168,6 +1241,9 @@
#{orderCode,jdbcType=VARCHAR},
#{transactionCode,jdbcType=VARCHAR},
#{orderStatus,jdbcType=VARCHAR},
#{orderType,jdbcType=VARCHAR},
#{mergeChargeNumber,jdbcType=VARCHAR},
#{mainConnectorCode,jdbcType=VARCHAR},
#{memberId,jdbcType=VARCHAR},
#{stationId,jdbcType=VARCHAR},
#{merchantId,jdbcType=VARCHAR},
@@ -1216,6 +1292,9 @@
order_code = #{orderCode,jdbcType=VARCHAR},
transaction_code = #{transactionCode,jdbcType=VARCHAR},
order_status = #{orderStatus,jdbcType=VARCHAR},
order_type = #{orderType,jdbcType=VARCHAR},
merge_charge_number = #{mergeChargeNumber,jdbcType=VARCHAR},
main_connector_code = #{mainConnectorCode,jdbcType=VARCHAR},
member_id = #{memberId,jdbcType=VARCHAR},
station_id = #{stationId,jdbcType=VARCHAR},
merchant_id = #{merchantId,jdbcType=VARCHAR},
@@ -1274,6 +1353,15 @@
<if test="orderStatus != null">
order_status,
</if>
<if test="orderType != null">
order_type,
</if>
<if test="mergeChargeNumber != null">
merge_charge_number,
</if>
<if test="mainConnectorCode != null">
main_connector_code,
</if>
<if test="memberId != null">
member_id,
</if>
@@ -1406,6 +1494,15 @@
<if test="orderStatus != null">
#{orderStatus,jdbcType=VARCHAR},
</if>
<if test="orderType != null">
#{orderType,jdbcType=VARCHAR},
</if>
<if test="mergeChargeNumber != null">
#{mergeChargeNumber,jdbcType=VARCHAR},
</if>
<if test="mainConnectorCode != null">
#{mainConnectorCode,jdbcType=VARCHAR},
</if>
<if test="memberId != null">
#{memberId,jdbcType=VARCHAR},
</if>
@@ -1538,6 +1635,15 @@
<if test="orderStatus != null">
order_status = #{orderStatus,jdbcType=VARCHAR},
</if>
<if test="orderType != null">
order_type = #{orderType,jdbcType=VARCHAR},
</if>
<if test="mergeChargeNumber != null">
merge_charge_number = #{mergeChargeNumber,jdbcType=VARCHAR},
</if>
<if test="mainConnectorCode != null">
main_connector_code = #{mainConnectorCode,jdbcType=VARCHAR},
</if>
<if test="memberId != null">
member_id = #{memberId,jdbcType=VARCHAR},
</if>
@@ -2661,6 +2767,9 @@
<if test="startMode != null and startMode != ''">
AND start_mode = #{startMode,jdbcType=VARCHAR}
</if>
<if test="orderType != null and startMode != ''" >
and order_type = #{orderType,jdbcType=VARCHAR}
</if>
order by create_time desc
limit 1
</select>