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

加字段

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-01-14 14:44:14 +08:00
parent 687f97fc88
commit d490d9d5b0
3 changed files with 248 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,6 @@
<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" />
@@ -25,6 +24,7 @@
<result column="plate_number" jdbcType="VARCHAR" property="plateNumber" />
<result column="order_amount" jdbcType="DECIMAL" property="orderAmount" />
<result column="virtual_amount" jdbcType="DECIMAL" property="virtualAmount" />
<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="charge_start_time" jdbcType="TIMESTAMP" property="chargeStartTime" />
@@ -46,9 +46,9 @@
<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, third_party_type, pay_mode,
pay_status, pay_amount, pay_time, plate_number, order_amount, virtual_amount, discount_amount,
settle_amount, charge_start_time, charge_end_time, start_type, appointment_time,
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
</sql>
@@ -69,29 +69,29 @@
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, third_party_type,
logic_card, vin_code, start_mode,
pay_mode, pay_status, pay_amount,
pay_time, plate_number, order_amount,
virtual_amount, 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
)
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)
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}, #{thirdPartyType,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}, #{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}
)
#{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})
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.OrderBasicInfo" useGeneratedKeys="true">
<!--@mbg.generated-->
@@ -133,9 +133,6 @@
<if test="startMode != null">
start_mode,
</if>
<if test="thirdPartyType != null">
third_party_type,
</if>
<if test="payMode != null">
pay_mode,
</if>
@@ -157,6 +154,9 @@
<if test="virtualAmount != null">
virtual_amount,
</if>
<if test="groupCode != null">
group_code,
</if>
<if test="discountAmount != null">
discount_amount,
</if>
@@ -246,9 +246,6 @@
<if test="startMode != null">
#{startMode,jdbcType=VARCHAR},
</if>
<if test="thirdPartyType != null">
#{thirdPartyType,jdbcType=VARCHAR},
</if>
<if test="payMode != null">
#{payMode,jdbcType=VARCHAR},
</if>
@@ -270,6 +267,9 @@
<if test="virtualAmount != null">
#{virtualAmount,jdbcType=DECIMAL},
</if>
<if test="groupCode != null">
#{groupCode,jdbcType=VARCHAR},
</if>
<if test="discountAmount != null">
#{discountAmount,jdbcType=DECIMAL},
</if>
@@ -363,9 +363,6 @@
<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>
@@ -387,6 +384,9 @@
<if test="virtualAmount != null">
virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
</if>
<if test="groupCode != null">
group_code = #{groupCode,jdbcType=VARCHAR},
</if>
<if test="discountAmount != null">
discount_amount = #{discountAmount,jdbcType=DECIMAL},
</if>
@@ -456,7 +456,6 @@
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},
@@ -464,6 +463,7 @@
plate_number = #{plateNumber,jdbcType=VARCHAR},
order_amount = #{orderAmount,jdbcType=DECIMAL},
virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
group_code = #{groupCode,jdbcType=VARCHAR},
discount_amount = #{discountAmount,jdbcType=DECIMAL},
settle_amount = #{settleAmount,jdbcType=DECIMAL},
charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP},
@@ -547,11 +547,6 @@
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}
@@ -587,6 +582,11 @@
when id = #{item.id,jdbcType=INTEGER} then #{item.virtualAmount,jdbcType=DECIMAL}
</foreach>
</trim>
<trim prefix="group_code = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.groupCode,jdbcType=VARCHAR}
</foreach>
</trim>
<trim prefix="discount_amount = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.discountAmount,jdbcType=DECIMAL}
@@ -766,13 +766,6 @@
</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">
@@ -822,6 +815,13 @@
</if>
</foreach>
</trim>
<trim prefix="group_code = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.groupCode != null">
when id = #{item.id,jdbcType=INTEGER} then #{item.groupCode,jdbcType=VARCHAR}
</if>
</foreach>
</trim>
<trim prefix="discount_amount = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.discountAmount != null">
@@ -951,20 +951,20 @@
<!--@mbg.generated-->
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, third_party_type,
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,
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)
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)
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.thirdPartyType,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.discountAmount,jdbcType=DECIMAL},
#{item.virtualAmount,jdbcType=DECIMAL}, #{item.groupCode,jdbcType=VARCHAR}, #{item.discountAmount,jdbcType=DECIMAL},
#{item.settleAmount,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},
@@ -993,7 +993,6 @@
logic_card,
vin_code,
start_mode,
third_party_type,
pay_mode,
pay_status,
pay_amount,
@@ -1001,6 +1000,7 @@
plate_number,
order_amount,
virtual_amount,
group_code,
discount_amount,
settle_amount,
charge_start_time,
@@ -1036,7 +1036,6 @@
#{logicCard,jdbcType=VARCHAR},
#{vinCode,jdbcType=VARCHAR},
#{startMode,jdbcType=VARCHAR},
#{thirdPartyType,jdbcType=VARCHAR},
#{payMode,jdbcType=VARCHAR},
#{payStatus,jdbcType=VARCHAR},
#{payAmount,jdbcType=DECIMAL},
@@ -1044,6 +1043,7 @@
#{plateNumber,jdbcType=VARCHAR},
#{orderAmount,jdbcType=DECIMAL},
#{virtualAmount,jdbcType=DECIMAL},
#{groupCode,jdbcType=VARCHAR},
#{discountAmount,jdbcType=DECIMAL},
#{settleAmount,jdbcType=DECIMAL},
#{chargeStartTime,jdbcType=TIMESTAMP},
@@ -1079,7 +1079,6 @@
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},
@@ -1087,6 +1086,7 @@
plate_number = #{plateNumber,jdbcType=VARCHAR},
order_amount = #{orderAmount,jdbcType=DECIMAL},
virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
group_code = #{groupCode,jdbcType=VARCHAR},
discount_amount = #{discountAmount,jdbcType=DECIMAL},
settle_amount = #{settleAmount,jdbcType=DECIMAL},
charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP},
@@ -1149,9 +1149,6 @@
<if test="startMode != null">
start_mode,
</if>
<if test="thirdPartyType != null">
third_party_type,
</if>
<if test="payMode != null">
pay_mode,
</if>
@@ -1173,6 +1170,9 @@
<if test="virtualAmount != null">
virtual_amount,
</if>
<if test="groupCode != null">
group_code,
</if>
<if test="discountAmount != null">
discount_amount,
</if>
@@ -1266,9 +1266,6 @@
<if test="startMode != null">
#{startMode,jdbcType=VARCHAR},
</if>
<if test="thirdPartyType != null">
#{thirdPartyType,jdbcType=VARCHAR},
</if>
<if test="payMode != null">
#{payMode,jdbcType=VARCHAR},
</if>
@@ -1290,6 +1287,9 @@
<if test="virtualAmount != null">
#{virtualAmount,jdbcType=DECIMAL},
</if>
<if test="groupCode != null">
#{groupCode,jdbcType=VARCHAR},
</if>
<if test="discountAmount != null">
#{discountAmount,jdbcType=DECIMAL},
</if>
@@ -1383,9 +1383,6 @@
<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>
@@ -1407,6 +1404,9 @@
<if test="virtualAmount != null">
virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
</if>
<if test="groupCode != null">
group_code = #{groupCode,jdbcType=VARCHAR},
</if>
<if test="discountAmount != null">
discount_amount = #{discountAmount,jdbcType=DECIMAL},
</if>
@@ -1622,12 +1622,12 @@
and t1.merchant_id = #{merchantId,jdbcType=VARCHAR}
</if>
<!-- 数据范围过滤 -->
<!-- &lt;if test="merchantDeptIds != null and merchantDeptIds.size() != 0"&gt;-->
<!-- &amp;lt;if test="merchantDeptIds != null and merchantDeptIds.size() != 0"&amp;gt;-->
<!-- and t3.dept_id in-->
<!-- &lt;foreach collection="merchantDeptIds" item="merchantDeptId" open="(" separator="," close=")"&gt;-->
<!-- &amp;lt;foreach collection="merchantDeptIds" item="merchantDeptId" open="(" separator="," close=")"&amp;gt;-->
<!-- #{merchantDeptId}-->
<!-- &lt;/foreach&gt;-->
<!-- &lt;/if&gt;-->
<!-- &amp;lt;/foreach&amp;gt;-->
<!-- &amp;lt;/if&amp;gt;-->
<if test="stationDeptIds != null and stationDeptIds.size() != 0">
and t3.dept_id in
<foreach close=")" collection="stationDeptIds" item="stationDeptId" open="(" separator=",">