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

add 订单基本信息表添加 third_party_type 字段

Browse Source
This commit is contained in:
Lemon
2024-01-13 09:51:56 +08:00
parent 77b843f589
commit 7f20c611db
3 changed files with 56 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java
View File

@@ -104,6 +104,12 @@ public class OrderBasicInfo extends BaseEntity {
@Excel(name = "启动方式") @Excel(name = "启动方式")
private String startMode; private String startMode;
/**
* 第三方平台类型
*/
@Excel(name = "第三方平台类型")
private String thirdPartyType;
/** /**
* 支付方式 * 支付方式
* 1-余额支付；3-白名单支付; 4-微信支付；5-支付宝支付； * 1-余额支付；3-白名单支付; 4-微信支付；5-支付宝支付；

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -2513,7 +2513,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
.connectorCode(connectorCode) .connectorCode(connectorCode)
.pileConnectorCode(pileConnectorCode) .pileConnectorCode(pileConnectorCode)
// .logicCard(pileAuthCardInfo.getLogicCard()) // 卡号 // .logicCard(pileAuthCardInfo.getLogicCard()) // 卡号
.startMode(StartModeEnum.THIRD_PARTY_PLATFORM.getValue()) .startMode(StartModeEnum.THIRD_PARTY_PLATFORM.getValue()) // 启动方式
.payStatus(Constants.ONE) .payStatus(Constants.ONE)
.payAmount(dto.getAccountBalance()) // 支付金额 .payAmount(dto.getAccountBalance()) // 支付金额
.payTime(new Date()) .payTime(new Date())

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

@@ -17,6 +17,7 @@
<result column="logic_card" jdbcType="VARCHAR" property="logicCard" /> <result column="logic_card" jdbcType="VARCHAR" property="logicCard" />
<result column="vin_code" jdbcType="VARCHAR" property="vinCode" /> <result column="vin_code" jdbcType="VARCHAR" property="vinCode" />
<result column="start_mode" jdbcType="VARCHAR" property="startMode" /> <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_mode" jdbcType="VARCHAR" property="payMode" />
<result column="pay_status" jdbcType="VARCHAR" property="payStatus" /> <result column="pay_status" jdbcType="VARCHAR" property="payStatus" />
<result column="pay_amount" jdbcType="DECIMAL" property="payAmount" /> <result column="pay_amount" jdbcType="DECIMAL" property="payAmount" />
@@ -45,7 +46,7 @@
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!--@mbg.generated--> <!--@mbg.generated-->
id, order_code, transaction_code, order_status, member_id, station_id, merchant_id, 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, 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, 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, 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, start_soc, end_soc, reason, settlement_time, refund_amount, refund_status, create_by,
@@ -68,7 +69,7 @@
insert into order_basic_info (order_code, transaction_code, order_status, insert into order_basic_info (order_code, transaction_code, order_status,
member_id, station_id, merchant_id, member_id, station_id, merchant_id,
pile_sn, connector_code, pile_connector_code, pile_sn, connector_code, pile_connector_code,
logic_card, vin_code, start_mode, logic_card, vin_code, start_mode, third_party_type,
pay_mode, pay_status, pay_amount, pay_mode, pay_status, pay_amount,
pay_time, plate_number, order_amount, pay_time, plate_number, order_amount,
virtual_amount, discount_amount, settle_amount, virtual_amount, discount_amount, settle_amount,
@@ -81,7 +82,7 @@
values (#{orderCode,jdbcType=VARCHAR}, #{transactionCode,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, values (#{orderCode,jdbcType=VARCHAR}, #{transactionCode,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR},
#{memberId,jdbcType=VARCHAR}, #{stationId,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{stationId,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR},
#{pileSn,jdbcType=VARCHAR}, #{connectorCode,jdbcType=VARCHAR}, #{pileConnectorCode,jdbcType=VARCHAR}, #{pileSn,jdbcType=VARCHAR}, #{connectorCode,jdbcType=VARCHAR}, #{pileConnectorCode,jdbcType=VARCHAR},
#{logicCard,jdbcType=VARCHAR}, #{vinCode,jdbcType=VARCHAR}, #{startMode,jdbcType=VARCHAR}, #{logicCard,jdbcType=VARCHAR}, #{vinCode,jdbcType=VARCHAR}, #{startMode,jdbcType=VARCHAR}, #{thirdPartyType,jdbcType=VARCHAR},
#{payMode,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{payAmount,jdbcType=DECIMAL}, #{payMode,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{payAmount,jdbcType=DECIMAL},
#{payTime,jdbcType=TIMESTAMP}, #{plateNumber,jdbcType=VARCHAR}, #{orderAmount,jdbcType=DECIMAL}, #{payTime,jdbcType=TIMESTAMP}, #{plateNumber,jdbcType=VARCHAR}, #{orderAmount,jdbcType=DECIMAL},
#{virtualAmount,jdbcType=DECIMAL}, #{discountAmount,jdbcType=DECIMAL}, #{settleAmount,jdbcType=DECIMAL}, #{virtualAmount,jdbcType=DECIMAL}, #{discountAmount,jdbcType=DECIMAL}, #{settleAmount,jdbcType=DECIMAL},
@@ -132,6 +133,9 @@
<if test="startMode != null"> <if test="startMode != null">
start_mode, start_mode,
</if> </if>
<if test="thirdPartyType != null">
third_party_type,
</if>
<if test="payMode != null"> <if test="payMode != null">
pay_mode, pay_mode,
</if> </if>
@@ -242,6 +246,9 @@
<if test="startMode != null"> <if test="startMode != null">
#{startMode,jdbcType=VARCHAR}, #{startMode,jdbcType=VARCHAR},
</if> </if>
<if test="thirdPartyType != null">
#{thirdPartyType,jdbcType=VARCHAR},
</if>
<if test="payMode != null"> <if test="payMode != null">
#{payMode,jdbcType=VARCHAR}, #{payMode,jdbcType=VARCHAR},
</if> </if>
@@ -356,6 +363,9 @@
<if test="startMode != null"> <if test="startMode != null">
start_mode = #{startMode,jdbcType=VARCHAR}, start_mode = #{startMode,jdbcType=VARCHAR},
</if> </if>
<if test="thirdPartyType != null">
third_party_type = #{thirdPartyType,jdbcType=VARCHAR},
</if>
<if test="payMode != null"> <if test="payMode != null">
pay_mode = #{payMode,jdbcType=VARCHAR}, pay_mode = #{payMode,jdbcType=VARCHAR},
</if> </if>
@@ -446,6 +456,7 @@
logic_card = #{logicCard,jdbcType=VARCHAR}, logic_card = #{logicCard,jdbcType=VARCHAR},
vin_code = #{vinCode,jdbcType=VARCHAR}, vin_code = #{vinCode,jdbcType=VARCHAR},
start_mode = #{startMode,jdbcType=VARCHAR}, start_mode = #{startMode,jdbcType=VARCHAR},
third_party_type = #{thirdPartyType,jdbcType=VARCHAR},
pay_mode = #{payMode,jdbcType=VARCHAR}, pay_mode = #{payMode,jdbcType=VARCHAR},
pay_status = #{payStatus,jdbcType=VARCHAR}, pay_status = #{payStatus,jdbcType=VARCHAR},
pay_amount = #{payAmount,jdbcType=DECIMAL}, pay_amount = #{payAmount,jdbcType=DECIMAL},
@@ -536,6 +547,11 @@
when id = #{item.id,jdbcType=INTEGER} then #{item.startMode,jdbcType=VARCHAR} when id = #{item.id,jdbcType=INTEGER} then #{item.startMode,jdbcType=VARCHAR}
</foreach> </foreach>
</trim> </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,"> <trim prefix="pay_mode = case" suffix="end,">
<foreach collection="list" index="index" item="item"> <foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.payMode,jdbcType=VARCHAR} when id = #{item.id,jdbcType=INTEGER} then #{item.payMode,jdbcType=VARCHAR}
@@ -750,6 +766,13 @@
</if> </if>
</foreach> </foreach>
</trim> </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,"> <trim prefix="pay_mode = case" suffix="end,">
<foreach collection="list" index="index" item="item"> <foreach collection="list" index="index" item="item">
<if test="item.payMode != null"> <if test="item.payMode != null">
@@ -928,7 +951,7 @@
<!--@mbg.generated--> <!--@mbg.generated-->
insert into order_basic_info insert into order_basic_info
(order_code, transaction_code, order_status, member_id, station_id, merchant_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, 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, 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, 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, appointment_time, start_soc, end_soc, reason, settlement_time, refund_amount, refund_status,
@@ -938,7 +961,7 @@
(#{item.orderCode,jdbcType=VARCHAR}, #{item.transactionCode,jdbcType=VARCHAR}, #{item.orderStatus,jdbcType=VARCHAR}, (#{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.memberId,jdbcType=VARCHAR}, #{item.stationId,jdbcType=VARCHAR}, #{item.merchantId,jdbcType=VARCHAR},
#{item.pileSn,jdbcType=VARCHAR}, #{item.connectorCode,jdbcType=VARCHAR}, #{item.pileConnectorCode,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.logicCard,jdbcType=VARCHAR}, #{item.vinCode,jdbcType=VARCHAR}, #{item.startMode,jdbcType=VARCHAR}, #{item.thirdPartyType,jdbcType=VARCHAR},
#{item.payMode,jdbcType=VARCHAR}, #{item.payStatus,jdbcType=VARCHAR}, #{item.payAmount,jdbcType=DECIMAL}, #{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.payTime,jdbcType=TIMESTAMP}, #{item.plateNumber,jdbcType=VARCHAR}, #{item.orderAmount,jdbcType=DECIMAL},
#{item.virtualAmount,jdbcType=DECIMAL}, #{item.discountAmount,jdbcType=DECIMAL}, #{item.virtualAmount,jdbcType=DECIMAL}, #{item.discountAmount,jdbcType=DECIMAL},
@@ -970,6 +993,7 @@
logic_card, logic_card,
vin_code, vin_code,
start_mode, start_mode,
third_party_type,
pay_mode, pay_mode,
pay_status, pay_status,
pay_amount, pay_amount,
@@ -1012,6 +1036,7 @@
#{logicCard,jdbcType=VARCHAR}, #{logicCard,jdbcType=VARCHAR},
#{vinCode,jdbcType=VARCHAR}, #{vinCode,jdbcType=VARCHAR},
#{startMode,jdbcType=VARCHAR}, #{startMode,jdbcType=VARCHAR},
#{thirdPartyType,jdbcType=VARCHAR},
#{payMode,jdbcType=VARCHAR}, #{payMode,jdbcType=VARCHAR},
#{payStatus,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR},
#{payAmount,jdbcType=DECIMAL}, #{payAmount,jdbcType=DECIMAL},
@@ -1054,6 +1079,7 @@
logic_card = #{logicCard,jdbcType=VARCHAR}, logic_card = #{logicCard,jdbcType=VARCHAR},
vin_code = #{vinCode,jdbcType=VARCHAR}, vin_code = #{vinCode,jdbcType=VARCHAR},
start_mode = #{startMode,jdbcType=VARCHAR}, start_mode = #{startMode,jdbcType=VARCHAR},
third_party_type = #{thirdPartyType,jdbcType=VARCHAR},
pay_mode = #{payMode,jdbcType=VARCHAR}, pay_mode = #{payMode,jdbcType=VARCHAR},
pay_status = #{payStatus,jdbcType=VARCHAR}, pay_status = #{payStatus,jdbcType=VARCHAR},
pay_amount = #{payAmount,jdbcType=DECIMAL}, pay_amount = #{payAmount,jdbcType=DECIMAL},
@@ -1123,6 +1149,9 @@
<if test="startMode != null"> <if test="startMode != null">
start_mode, start_mode,
</if> </if>
<if test="thirdPartyType != null">
third_party_type,
</if>
<if test="payMode != null"> <if test="payMode != null">
pay_mode, pay_mode,
</if> </if>
@@ -1237,6 +1266,9 @@
<if test="startMode != null"> <if test="startMode != null">
#{startMode,jdbcType=VARCHAR}, #{startMode,jdbcType=VARCHAR},
</if> </if>
<if test="thirdPartyType != null">
#{thirdPartyType,jdbcType=VARCHAR},
</if>
<if test="payMode != null"> <if test="payMode != null">
#{payMode,jdbcType=VARCHAR}, #{payMode,jdbcType=VARCHAR},
</if> </if>
@@ -1351,6 +1383,9 @@
<if test="startMode != null"> <if test="startMode != null">
start_mode = #{startMode,jdbcType=VARCHAR}, start_mode = #{startMode,jdbcType=VARCHAR},
</if> </if>
<if test="thirdPartyType != null">
third_party_type = #{thirdPartyType,jdbcType=VARCHAR},
</if>
<if test="payMode != null"> <if test="payMode != null">
pay_mode = #{payMode,jdbcType=VARCHAR}, pay_mode = #{payMode,jdbcType=VARCHAR},
</if> </if>
@@ -1747,6 +1782,9 @@
<if test="startMode != null"> <if test="startMode != null">
start_mode, start_mode,
</if> </if>
<if test="thirdPartyType != null">
third_party_type,
</if>
<if test="payMode != null"> <if test="payMode != null">
pay_mode, pay_mode,
</if> </if>
@@ -1851,6 +1889,9 @@
<if test="startMode != null"> <if test="startMode != null">
#{startMode}, #{startMode},
</if> </if>
<if test="thirdPartyType != null">
#{thirdPartyType},
</if>
<if test="payMode != null"> <if test="payMode != null">
#{payMode}, #{payMode},
</if> </if>
@@ -1956,6 +1997,9 @@
<if test="startMode != null"> <if test="startMode != null">
start_mode = #{startMode}, start_mode = #{startMode},
</if> </if>
<if test="thirdPartyType != null">
third_party_type = #{thirdPartyType},
</if>
<if test="payMode != null"> <if test="payMode != null">
pay_mode = #{payMode}, pay_mode = #{payMode},
</if> </if>