diff --git a/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml
index ddbe880d5..4afddfc72 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml
@@ -1,800 +1,935 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- id, merchant_id, station_id, order_codes, use_electricity, charge_num, charge_time,
- electricity_amount, service_amount, total_amount, virtual_amount, trade_date, trade_amount,
- trade_fee, create_time, del_flag
-
-
-
-
- delete from settle_order_report
- where id = #{id,jdbcType=INTEGER}
-
-
-
- insert into settle_order_report (merchant_id, station_id, order_codes,
- use_electricity, charge_num, charge_time,
- electricity_amount, service_amount, total_amount,
- virtual_amount, trade_date, trade_amount,
- trade_fee, create_time, del_flag
- )
- values (#{merchantId,jdbcType=VARCHAR}, #{stationId,jdbcType=VARCHAR}, #{orderCodes,jdbcType=LONGVARCHAR},
- #{useElectricity,jdbcType=DECIMAL}, #{chargeNum,jdbcType=VARCHAR}, #{chargeTime,jdbcType=VARCHAR},
- #{electricityAmount,jdbcType=DECIMAL}, #{serviceAmount,jdbcType=DECIMAL}, #{totalAmount,jdbcType=DECIMAL},
- #{virtualAmount,jdbcType=DECIMAL}, #{tradeDate,jdbcType=VARCHAR}, #{tradeAmount,jdbcType=DECIMAL},
- #{tradeFee,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=VARCHAR}
- )
-
-
-
- insert into settle_order_report
-
-
- merchant_id,
-
-
- station_id,
-
-
- order_codes,
-
-
- use_electricity,
-
-
- charge_num,
-
-
- charge_time,
-
-
- electricity_amount,
-
-
- service_amount,
-
-
- total_amount,
-
-
- virtual_amount,
-
-
- trade_date,
-
-
- trade_amount,
-
-
- trade_fee,
-
-
- create_time,
-
-
- del_flag,
-
-
-
-
- #{merchantId,jdbcType=VARCHAR},
-
-
- #{stationId,jdbcType=VARCHAR},
-
-
- #{orderCodes,jdbcType=LONGVARCHAR},
-
-
- #{useElectricity,jdbcType=DECIMAL},
-
-
- #{chargeNum,jdbcType=VARCHAR},
-
-
- #{chargeTime,jdbcType=VARCHAR},
-
-
- #{electricityAmount,jdbcType=DECIMAL},
-
-
- #{serviceAmount,jdbcType=DECIMAL},
-
-
- #{totalAmount,jdbcType=DECIMAL},
-
-
- #{virtualAmount,jdbcType=DECIMAL},
-
-
- #{tradeDate,jdbcType=VARCHAR},
-
-
- #{tradeAmount,jdbcType=DECIMAL},
-
-
- #{tradeFee,jdbcType=DECIMAL},
-
-
- #{createTime,jdbcType=TIMESTAMP},
-
-
- #{delFlag,jdbcType=VARCHAR},
-
-
-
-
-
- update settle_order_report
-
-
- merchant_id = #{merchantId,jdbcType=VARCHAR},
-
-
- station_id = #{stationId,jdbcType=VARCHAR},
-
-
- order_codes = #{orderCodes,jdbcType=LONGVARCHAR},
-
-
- use_electricity = #{useElectricity,jdbcType=DECIMAL},
-
-
- charge_num = #{chargeNum,jdbcType=VARCHAR},
-
-
- charge_time = #{chargeTime,jdbcType=VARCHAR},
-
-
- electricity_amount = #{electricityAmount,jdbcType=DECIMAL},
-
-
- service_amount = #{serviceAmount,jdbcType=DECIMAL},
-
-
- total_amount = #{totalAmount,jdbcType=DECIMAL},
-
-
- virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
-
-
- trade_date = #{tradeDate,jdbcType=VARCHAR},
-
-
- trade_amount = #{tradeAmount,jdbcType=DECIMAL},
-
-
- trade_fee = #{tradeFee,jdbcType=DECIMAL},
-
-
- create_time = #{createTime,jdbcType=TIMESTAMP},
-
-
- del_flag = #{delFlag,jdbcType=VARCHAR},
-
-
- where id = #{id,jdbcType=INTEGER}
-
-
-
- update settle_order_report
- set merchant_id = #{merchantId,jdbcType=VARCHAR},
- station_id = #{stationId,jdbcType=VARCHAR},
- order_codes = #{orderCodes,jdbcType=LONGVARCHAR},
- use_electricity = #{useElectricity,jdbcType=DECIMAL},
- charge_num = #{chargeNum,jdbcType=VARCHAR},
- charge_time = #{chargeTime,jdbcType=VARCHAR},
- electricity_amount = #{electricityAmount,jdbcType=DECIMAL},
- service_amount = #{serviceAmount,jdbcType=DECIMAL},
- total_amount = #{totalAmount,jdbcType=DECIMAL},
- virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
- trade_date = #{tradeDate,jdbcType=VARCHAR},
- trade_amount = #{tradeAmount,jdbcType=DECIMAL},
- trade_fee = #{tradeFee,jdbcType=DECIMAL},
- create_time = #{createTime,jdbcType=TIMESTAMP},
- del_flag = #{delFlag,jdbcType=VARCHAR}
- where id = #{id,jdbcType=INTEGER}
-
-
-
- update settle_order_report
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.merchantId,jdbcType=VARCHAR}
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.stationId,jdbcType=VARCHAR}
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.orderCodes,jdbcType=LONGVARCHAR}
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.useElectricity,jdbcType=DECIMAL}
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.chargeNum,jdbcType=VARCHAR}
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.chargeTime,jdbcType=VARCHAR}
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.electricityAmount,jdbcType=DECIMAL}
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.serviceAmount,jdbcType=DECIMAL}
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.totalAmount,jdbcType=DECIMAL}
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.virtualAmount,jdbcType=DECIMAL}
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.tradeDate,jdbcType=VARCHAR}
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.tradeAmount,jdbcType=DECIMAL}
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.tradeFee,jdbcType=DECIMAL}
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP}
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.delFlag,jdbcType=VARCHAR}
-
-
-
- where id in
-
- #{item.id,jdbcType=INTEGER}
-
-
-
-
- update settle_order_report
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.merchantId,jdbcType=VARCHAR}
-
-
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.stationId,jdbcType=VARCHAR}
-
-
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.orderCodes,jdbcType=LONGVARCHAR}
-
-
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.useElectricity,jdbcType=DECIMAL}
-
-
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.chargeNum,jdbcType=VARCHAR}
-
-
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.chargeTime,jdbcType=VARCHAR}
-
-
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.electricityAmount,jdbcType=DECIMAL}
-
-
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.serviceAmount,jdbcType=DECIMAL}
-
-
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.totalAmount,jdbcType=DECIMAL}
-
-
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.virtualAmount,jdbcType=DECIMAL}
-
-
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.tradeDate,jdbcType=VARCHAR}
-
-
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.tradeAmount,jdbcType=DECIMAL}
-
-
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.tradeFee,jdbcType=DECIMAL}
-
-
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP}
-
-
-
-
-
-
- when id = #{item.id,jdbcType=INTEGER} then #{item.delFlag,jdbcType=VARCHAR}
-
-
-
-
- where id in
-
- #{item.id,jdbcType=INTEGER}
-
-
-
-
- insert into settle_order_report
- (merchant_id, station_id, order_codes, use_electricity, charge_num, charge_time,
- electricity_amount, service_amount, total_amount, virtual_amount, trade_date, trade_amount,
- trade_fee, create_time, del_flag)
- values
-
- (#{item.merchantId,jdbcType=VARCHAR}, #{item.stationId,jdbcType=VARCHAR}, #{item.orderCodes,jdbcType=LONGVARCHAR},
- #{item.useElectricity,jdbcType=DECIMAL}, #{item.chargeNum,jdbcType=VARCHAR}, #{item.chargeTime,jdbcType=VARCHAR},
- #{item.electricityAmount,jdbcType=DECIMAL}, #{item.serviceAmount,jdbcType=DECIMAL},
- #{item.totalAmount,jdbcType=DECIMAL}, #{item.virtualAmount,jdbcType=DECIMAL}, #{item.tradeDate,jdbcType=VARCHAR},
- #{item.tradeAmount,jdbcType=DECIMAL}, #{item.tradeFee,jdbcType=DECIMAL}, #{item.createTime,jdbcType=TIMESTAMP},
- #{item.delFlag,jdbcType=VARCHAR})
-
-
-
-
- insert into settle_order_report
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
id,
-
- merchant_id,
- station_id,
- order_codes,
- use_electricity,
- charge_num,
- charge_time,
- electricity_amount,
- service_amount,
- total_amount,
- virtual_amount,
- trade_date,
- trade_amount,
- trade_fee,
-
- values
-
-
- #{id,jdbcType=INTEGER},
-
- #{merchantId,jdbcType=VARCHAR},
- #{stationId,jdbcType=VARCHAR},
- #{orderCodes,jdbcType=LONGVARCHAR},
- #{useElectricity,jdbcType=DECIMAL},
- #{chargeNum,jdbcType=VARCHAR},
- #{chargeTime,jdbcType=VARCHAR},
- #{electricityAmount,jdbcType=DECIMAL},
- #{serviceAmount,jdbcType=DECIMAL},
- #{totalAmount,jdbcType=DECIMAL},
- #{virtualAmount,jdbcType=DECIMAL},
- #{tradeDate,jdbcType=VARCHAR},
- #{tradeAmount,jdbcType=DECIMAL},
- #{tradeFee,jdbcType=DECIMAL},
-
- on duplicate key update
-
-
- id = #{id,jdbcType=INTEGER},
-
- merchant_id = #{merchantId,jdbcType=VARCHAR},
- station_id = #{stationId,jdbcType=VARCHAR},
- order_codes = #{orderCodes,jdbcType=LONGVARCHAR},
- use_electricity = #{useElectricity,jdbcType=DECIMAL},
- charge_num = #{chargeNum,jdbcType=VARCHAR},
- charge_time = #{chargeTime,jdbcType=VARCHAR},
- electricity_amount = #{electricityAmount,jdbcType=DECIMAL},
- service_amount = #{serviceAmount,jdbcType=DECIMAL},
- total_amount = #{totalAmount,jdbcType=DECIMAL},
- virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
- trade_date = #{tradeDate,jdbcType=VARCHAR},
- trade_amount = #{tradeAmount,jdbcType=DECIMAL},
- trade_fee = #{tradeFee,jdbcType=DECIMAL},
-
-
-
-
- insert into settle_order_report
-
-
- id,
-
-
merchant_id,
-
-
station_id,
-
-
order_codes,
-
-
use_electricity,
-
-
charge_num,
-
-
charge_time,
-
-
electricity_amount,
-
-
service_amount,
-
-
total_amount,
-
-
virtual_amount,
-
-
trade_date,
-
-
trade_amount,
-
-
trade_fee,
-
-
create_time,
-
-
- del_flag,
-
-
- values
-
-
- #{id,jdbcType=INTEGER},
-
-
- #{merchantId,jdbcType=VARCHAR},
-
-
- #{stationId,jdbcType=VARCHAR},
-
-
- #{orderCodes,jdbcType=LONGVARCHAR},
-
-
- #{useElectricity,jdbcType=DECIMAL},
-
-
- #{chargeNum,jdbcType=VARCHAR},
-
-
- #{chargeTime,jdbcType=VARCHAR},
-
-
- #{electricityAmount,jdbcType=DECIMAL},
-
-
- #{serviceAmount,jdbcType=DECIMAL},
-
-
- #{totalAmount,jdbcType=DECIMAL},
-
-
- #{virtualAmount,jdbcType=DECIMAL},
-
-
- #{tradeDate,jdbcType=VARCHAR},
-
-
- #{tradeAmount,jdbcType=DECIMAL},
-
-
- #{tradeFee,jdbcType=DECIMAL},
-
-
- #{createTime,jdbcType=TIMESTAMP},
-
-
- #{delFlag,jdbcType=VARCHAR},
-
-
- on duplicate key update
-
-
- id = #{id,jdbcType=INTEGER},
-
-
- merchant_id = #{merchantId,jdbcType=VARCHAR},
-
-
- station_id = #{stationId,jdbcType=VARCHAR},
-
-
- order_codes = #{orderCodes,jdbcType=LONGVARCHAR},
-
-
- use_electricity = #{useElectricity,jdbcType=DECIMAL},
-
-
- charge_num = #{chargeNum,jdbcType=VARCHAR},
-
-
- charge_time = #{chargeTime,jdbcType=VARCHAR},
-
-
- electricity_amount = #{electricityAmount,jdbcType=DECIMAL},
-
-
- service_amount = #{serviceAmount,jdbcType=DECIMAL},
-
-
- total_amount = #{totalAmount,jdbcType=DECIMAL},
-
-
- virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
-
-
- trade_date = #{tradeDate,jdbcType=VARCHAR},
-
-
- trade_amount = #{tradeAmount,jdbcType=DECIMAL},
-
-
- trade_fee = #{tradeFee,jdbcType=DECIMAL},
-
-
- create_time = #{createTime,jdbcType=TIMESTAMP},
-
-
- del_flag = #{delFlag,jdbcType=VARCHAR},
-
-
-
+ del_flag
+
+
+
+
+ delete
+ from settle_order_report
+ where id = #{id,jdbcType=INTEGER}
+
+
+
+ insert into settle_order_report (merchant_id, station_id, order_codes,
+ use_electricity, charge_num, charge_time,
+ electricity_amount, service_amount, total_amount,
+ virtual_amount, trade_date, trade_amount,
+ trade_fee, create_time, del_flag)
+ values (#{merchantId,jdbcType=VARCHAR}, #{stationId,jdbcType=VARCHAR}, #{orderCodes,jdbcType=LONGVARCHAR},
+ #{useElectricity,jdbcType=DECIMAL}, #{chargeNum,jdbcType=VARCHAR}, #{chargeTime,jdbcType=VARCHAR},
+ #{electricityAmount,jdbcType=DECIMAL}, #{serviceAmount,jdbcType=DECIMAL},
+ #{totalAmount,jdbcType=DECIMAL},
+ #{virtualAmount,jdbcType=DECIMAL}, #{tradeDate,jdbcType=VARCHAR}, #{tradeAmount,jdbcType=DECIMAL},
+ #{tradeFee,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=VARCHAR})
+
+
+
+ insert into settle_order_report
+
+
+ merchant_id,
+
+
+ station_id,
+
+
+ order_codes,
+
+
+ use_electricity,
+
+
+ charge_num,
+
+
+ charge_time,
+
+
+ electricity_amount,
+
+
+ service_amount,
+
+
+ total_amount,
+
+
+ virtual_amount,
+
+
+ trade_date,
+
+
+ trade_amount,
+
+
+ trade_fee,
+
+
+ create_time,
+
+
+ del_flag,
+
+
+
+
+ #{merchantId,jdbcType=VARCHAR},
+
+
+ #{stationId,jdbcType=VARCHAR},
+
+
+ #{orderCodes,jdbcType=LONGVARCHAR},
+
+
+ #{useElectricity,jdbcType=DECIMAL},
+
+
+ #{chargeNum,jdbcType=VARCHAR},
+
+
+ #{chargeTime,jdbcType=VARCHAR},
+
+
+ #{electricityAmount,jdbcType=DECIMAL},
+
+
+ #{serviceAmount,jdbcType=DECIMAL},
+
+
+ #{totalAmount,jdbcType=DECIMAL},
+
+
+ #{virtualAmount,jdbcType=DECIMAL},
+
+
+ #{tradeDate,jdbcType=VARCHAR},
+
+
+ #{tradeAmount,jdbcType=DECIMAL},
+
+
+ #{tradeFee,jdbcType=DECIMAL},
+
+
+ #{createTime,jdbcType=TIMESTAMP},
+
+
+ #{delFlag,jdbcType=VARCHAR},
+
+
+
+
+
+ update settle_order_report
+
+
+ merchant_id = #{merchantId,jdbcType=VARCHAR},
+
+
+ station_id = #{stationId,jdbcType=VARCHAR},
+
+
+ order_codes = #{orderCodes,jdbcType=LONGVARCHAR},
+
+
+ use_electricity = #{useElectricity,jdbcType=DECIMAL},
+
+
+ charge_num = #{chargeNum,jdbcType=VARCHAR},
+
+
+ charge_time = #{chargeTime,jdbcType=VARCHAR},
+
+
+ electricity_amount = #{electricityAmount,jdbcType=DECIMAL},
+
+
+ service_amount = #{serviceAmount,jdbcType=DECIMAL},
+
+
+ total_amount = #{totalAmount,jdbcType=DECIMAL},
+
+
+ virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
+
+
+ trade_date = #{tradeDate,jdbcType=VARCHAR},
+
+
+ trade_amount = #{tradeAmount,jdbcType=DECIMAL},
+
+
+ trade_fee = #{tradeFee,jdbcType=DECIMAL},
+
+
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+
+
+ del_flag = #{delFlag,jdbcType=VARCHAR},
+
+
+ where id = #{id,jdbcType=INTEGER}
+
+
+
+ update settle_order_report
+ set merchant_id = #{merchantId,jdbcType=VARCHAR},
+ station_id = #{stationId,jdbcType=VARCHAR},
+ order_codes = #{orderCodes,jdbcType=LONGVARCHAR},
+ use_electricity = #{useElectricity,jdbcType=DECIMAL},
+ charge_num = #{chargeNum,jdbcType=VARCHAR},
+ charge_time = #{chargeTime,jdbcType=VARCHAR},
+ electricity_amount = #{electricityAmount,jdbcType=DECIMAL},
+ service_amount = #{serviceAmount,jdbcType=DECIMAL},
+ total_amount = #{totalAmount,jdbcType=DECIMAL},
+ virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
+ trade_date = #{tradeDate,jdbcType=VARCHAR},
+ trade_amount = #{tradeAmount,jdbcType=DECIMAL},
+ trade_fee = #{tradeFee,jdbcType=DECIMAL},
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+ del_flag = #{delFlag,jdbcType=VARCHAR}
+ where id = #{id,jdbcType=INTEGER}
+
+
+
+ update settle_order_report
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.merchantId,jdbcType=VARCHAR}
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.stationId,jdbcType=VARCHAR}
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.orderCodes,jdbcType=LONGVARCHAR}
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.useElectricity,jdbcType=DECIMAL}
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.chargeNum,jdbcType=VARCHAR}
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.chargeTime,jdbcType=VARCHAR}
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.electricityAmount,jdbcType=DECIMAL}
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.serviceAmount,jdbcType=DECIMAL}
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.totalAmount,jdbcType=DECIMAL}
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.virtualAmount,jdbcType=DECIMAL}
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.tradeDate,jdbcType=VARCHAR}
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.tradeAmount,jdbcType=DECIMAL}
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.tradeFee,jdbcType=DECIMAL}
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP}
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.delFlag,jdbcType=VARCHAR}
+
+
+
+ where id in
+
+ #{item.id,jdbcType=INTEGER}
+
+
+
+
+ update settle_order_report
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.merchantId,jdbcType=VARCHAR}
+
+
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.stationId,jdbcType=VARCHAR}
+
+
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.orderCodes,jdbcType=LONGVARCHAR}
+
+
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.useElectricity,jdbcType=DECIMAL}
+
+
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.chargeNum,jdbcType=VARCHAR}
+
+
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.chargeTime,jdbcType=VARCHAR}
+
+
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.electricityAmount,jdbcType=DECIMAL}
+
+
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.serviceAmount,jdbcType=DECIMAL}
+
+
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.totalAmount,jdbcType=DECIMAL}
+
+
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.virtualAmount,jdbcType=DECIMAL}
+
+
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.tradeDate,jdbcType=VARCHAR}
+
+
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.tradeAmount,jdbcType=DECIMAL}
+
+
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.tradeFee,jdbcType=DECIMAL}
+
+
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP}
+
+
+
+
+
+
+ when id = #{item.id,jdbcType=INTEGER} then #{item.delFlag,jdbcType=VARCHAR}
+
+
+
+
+ where id in
+
+ #{item.id,jdbcType=INTEGER}
+
+
+
+
+ insert into settle_order_report
+ (merchant_id, station_id, order_codes, use_electricity, charge_num, charge_time,
+ electricity_amount, service_amount, total_amount, virtual_amount, trade_date, trade_amount,
+ trade_fee, create_time, del_flag)
+ values
+
+ (#{item.merchantId,jdbcType=VARCHAR}, #{item.stationId,jdbcType=VARCHAR},
+ #{item.orderCodes,jdbcType=LONGVARCHAR},
+ #{item.useElectricity,jdbcType=DECIMAL}, #{item.chargeNum,jdbcType=VARCHAR},
+ #{item.chargeTime,jdbcType=VARCHAR},
+ #{item.electricityAmount,jdbcType=DECIMAL}, #{item.serviceAmount,jdbcType=DECIMAL},
+ #{item.totalAmount,jdbcType=DECIMAL}, #{item.virtualAmount,jdbcType=DECIMAL},
+ #{item.tradeDate,jdbcType=VARCHAR},
+ #{item.tradeAmount,jdbcType=DECIMAL}, #{item.tradeFee,jdbcType=DECIMAL},
+ #{item.createTime,jdbcType=TIMESTAMP},
+ #{item.delFlag,jdbcType=VARCHAR})
+
+
+
+
+ insert into settle_order_report
+
+
+ id,
+
+ merchant_id,
+ station_id,
+ order_codes,
+ use_electricity,
+ charge_num,
+ charge_time,
+ electricity_amount,
+ service_amount,
+ total_amount,
+ virtual_amount,
+ trade_date,
+ trade_amount,
+ trade_fee,
+
+ values
+
+
+ #{id,jdbcType=INTEGER},
+
+ #{merchantId,jdbcType=VARCHAR},
+ #{stationId,jdbcType=VARCHAR},
+ #{orderCodes,jdbcType=LONGVARCHAR},
+ #{useElectricity,jdbcType=DECIMAL},
+ #{chargeNum,jdbcType=VARCHAR},
+ #{chargeTime,jdbcType=VARCHAR},
+ #{electricityAmount,jdbcType=DECIMAL},
+ #{serviceAmount,jdbcType=DECIMAL},
+ #{totalAmount,jdbcType=DECIMAL},
+ #{virtualAmount,jdbcType=DECIMAL},
+ #{tradeDate,jdbcType=VARCHAR},
+ #{tradeAmount,jdbcType=DECIMAL},
+ #{tradeFee,jdbcType=DECIMAL},
+
+ on duplicate key update
+
+
+ id = #{id,jdbcType=INTEGER},
+
+ merchant_id = #{merchantId,jdbcType=VARCHAR},
+ station_id = #{stationId,jdbcType=VARCHAR},
+ order_codes = #{orderCodes,jdbcType=LONGVARCHAR},
+ use_electricity = #{useElectricity,jdbcType=DECIMAL},
+ charge_num = #{chargeNum,jdbcType=VARCHAR},
+ charge_time = #{chargeTime,jdbcType=VARCHAR},
+ electricity_amount = #{electricityAmount,jdbcType=DECIMAL},
+ service_amount = #{serviceAmount,jdbcType=DECIMAL},
+ total_amount = #{totalAmount,jdbcType=DECIMAL},
+ virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
+ trade_date = #{tradeDate,jdbcType=VARCHAR},
+ trade_amount = #{tradeAmount,jdbcType=DECIMAL},
+ trade_fee = #{tradeFee,jdbcType=DECIMAL},
+
+
+
+
+ insert into settle_order_report
+
+
+ id,
+
+
+ merchant_id,
+
+
+ station_id,
+
+
+ order_codes,
+
+
+ use_electricity,
+
+
+ charge_num,
+
+
+ charge_time,
+
+
+ electricity_amount,
+
+
+ service_amount,
+
+
+ total_amount,
+
+
+ virtual_amount,
+
+
+ trade_date,
+
+
+ trade_amount,
+
+
+ trade_fee,
+
+
+ create_time,
+
+
+ del_flag,
+
+
+ values
+
+
+ #{id,jdbcType=INTEGER},
+
+
+ #{merchantId,jdbcType=VARCHAR},
+
+
+ #{stationId,jdbcType=VARCHAR},
+
+
+ #{orderCodes,jdbcType=LONGVARCHAR},
+
+
+ #{useElectricity,jdbcType=DECIMAL},
+
+
+ #{chargeNum,jdbcType=VARCHAR},
+
+
+ #{chargeTime,jdbcType=VARCHAR},
+
+
+ #{electricityAmount,jdbcType=DECIMAL},
+
+
+ #{serviceAmount,jdbcType=DECIMAL},
+
+
+ #{totalAmount,jdbcType=DECIMAL},
+
+
+ #{virtualAmount,jdbcType=DECIMAL},
+
+
+ #{tradeDate,jdbcType=VARCHAR},
+
+
+ #{tradeAmount,jdbcType=DECIMAL},
+
+
+ #{tradeFee,jdbcType=DECIMAL},
+
+
+ #{createTime,jdbcType=TIMESTAMP},
+
+
+ #{delFlag,jdbcType=VARCHAR},
+
+
+ on duplicate key update
+
+
+ id = #{id,jdbcType=INTEGER},
+
+
+ merchant_id = #{merchantId,jdbcType=VARCHAR},
+
+
+ station_id = #{stationId,jdbcType=VARCHAR},
+
+
+ order_codes = #{orderCodes,jdbcType=LONGVARCHAR},
+
+
+ use_electricity = #{useElectricity,jdbcType=DECIMAL},
+
+
+ charge_num = #{chargeNum,jdbcType=VARCHAR},
+
+
+ charge_time = #{chargeTime,jdbcType=VARCHAR},
+
+
+ electricity_amount = #{electricityAmount,jdbcType=DECIMAL},
+
+
+ service_amount = #{serviceAmount,jdbcType=DECIMAL},
+
+
+ total_amount = #{totalAmount,jdbcType=DECIMAL},
+
+
+ virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
+
+
+ trade_date = #{tradeDate,jdbcType=VARCHAR},
+
+
+ trade_amount = #{tradeAmount,jdbcType=DECIMAL},
+
+
+ trade_fee = #{tradeFee,jdbcType=DECIMAL},
+
+
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+
+
+ del_flag = #{delFlag,jdbcType=VARCHAR},
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
select
-
+
from settle_order_report
-
\ No newline at end of file
diff --git a/jsowell-ui/src/views/pile/basic/detail.vue b/jsowell-ui/src/views/pile/basic/detail.vue
index 8de244b9b..9e228be34 100644
--- a/jsowell-ui/src/views/pile/basic/detail.vue
+++ b/jsowell-ui/src/views/pile/basic/detail.vue
@@ -67,7 +67,13 @@
size="medium"
clearable
:disabled="clearableFlag"
+ type="number"
+ :min="1"
+ oninput="if(value<1)value=''"
>
+
+ 号桩
+