diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java index 17b00e575..29d76191f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java @@ -104,6 +104,12 @@ public class OrderBasicInfo extends BaseEntity { @Excel(name = "启动方式") private String startMode; + /** + * 第三方平台类型 + */ + @Excel(name = "第三方平台类型") + private String thirdPartyType; + /** * 支付方式 * 1-余额支付;3-白名单支付; 4-微信支付;5-支付宝支付; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 13326946f..86f677269 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -2513,7 +2513,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { .connectorCode(connectorCode) .pileConnectorCode(pileConnectorCode) // .logicCard(pileAuthCardInfo.getLogicCard()) // 卡号 - .startMode(StartModeEnum.THIRD_PARTY_PLATFORM.getValue()) + .startMode(StartModeEnum.THIRD_PARTY_PLATFORM.getValue()) // 启动方式 .payStatus(Constants.ONE) .payAmount(dto.getAccountBalance()) // 支付金额 .payTime(new Date()) diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index ac943c168..bee8d0e4a 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -17,6 +17,7 @@ + @@ -45,7 +46,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, 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, 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, @@ -68,7 +69,7 @@ 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, + 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, @@ -81,7 +82,7 @@ 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}, + #{logicCard,jdbcType=VARCHAR}, #{vinCode,jdbcType=VARCHAR}, #{startMode,jdbcType=VARCHAR}, #{thirdPartyType,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}, @@ -132,6 +133,9 @@ start_mode, + + third_party_type, + pay_mode, @@ -242,6 +246,9 @@ #{startMode,jdbcType=VARCHAR}, + + #{thirdPartyType,jdbcType=VARCHAR}, + #{payMode,jdbcType=VARCHAR}, @@ -356,6 +363,9 @@ start_mode = #{startMode,jdbcType=VARCHAR}, + + third_party_type = #{thirdPartyType,jdbcType=VARCHAR}, + pay_mode = #{payMode,jdbcType=VARCHAR}, @@ -446,6 +456,7 @@ 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}, @@ -536,6 +547,11 @@ when id = #{item.id,jdbcType=INTEGER} then #{item.startMode,jdbcType=VARCHAR} + + + when id = #{item.id,jdbcType=INTEGER} then #{item.thirdPartyType,jdbcType=VARCHAR} + + when id = #{item.id,jdbcType=INTEGER} then #{item.payMode,jdbcType=VARCHAR} @@ -750,6 +766,13 @@ + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.thirdPartyType,jdbcType=VARCHAR} + + + @@ -928,7 +951,7 @@ 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, + 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, 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.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.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.payTime,jdbcType=TIMESTAMP}, #{item.plateNumber,jdbcType=VARCHAR}, #{item.orderAmount,jdbcType=DECIMAL}, #{item.virtualAmount,jdbcType=DECIMAL}, #{item.discountAmount,jdbcType=DECIMAL}, @@ -970,6 +993,7 @@ logic_card, vin_code, start_mode, + third_party_type, pay_mode, pay_status, pay_amount, @@ -1012,6 +1036,7 @@ #{logicCard,jdbcType=VARCHAR}, #{vinCode,jdbcType=VARCHAR}, #{startMode,jdbcType=VARCHAR}, + #{thirdPartyType,jdbcType=VARCHAR}, #{payMode,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{payAmount,jdbcType=DECIMAL}, @@ -1054,6 +1079,7 @@ 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}, @@ -1123,6 +1149,9 @@ start_mode, + + third_party_type, + pay_mode, @@ -1237,6 +1266,9 @@ #{startMode,jdbcType=VARCHAR}, + + #{thirdPartyType,jdbcType=VARCHAR}, + #{payMode,jdbcType=VARCHAR}, @@ -1351,6 +1383,9 @@ start_mode = #{startMode,jdbcType=VARCHAR}, + + third_party_type = #{thirdPartyType,jdbcType=VARCHAR}, + pay_mode = #{payMode,jdbcType=VARCHAR}, @@ -1747,6 +1782,9 @@ start_mode, + + third_party_type, + pay_mode, @@ -1851,6 +1889,9 @@ #{startMode}, + + #{thirdPartyType}, + #{payMode}, @@ -1956,6 +1997,9 @@ start_mode = #{startMode}, + + third_party_type = #{thirdPartyType}, + pay_mode = #{payMode},