mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 02:55:04 +08:00
使用结算金额计算收入金额
This commit is contained in:
@@ -708,6 +708,7 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
|
||||
if (selectResult != null) {
|
||||
settleOrderReport.setId(selectResult.getId());
|
||||
settleOrderReport.setSettleCode(selectResult.getSettleCode());
|
||||
// settleOrderReport.setCreateTime(selectResult.getCreateTime()); // 沿用原来的创建时间
|
||||
}
|
||||
settleOrderReport.setDelFlag(DelFlagEnum.NORMAL.getValue());
|
||||
// 订单日报 新增或更新
|
||||
|
||||
@@ -397,8 +397,8 @@
|
||||
trade_date,
|
||||
trade_amount,
|
||||
trade_fee,
|
||||
create_time,
|
||||
update_time,
|
||||
<!-- create_time,-->
|
||||
<!-- update_time,-->
|
||||
del_flag,
|
||||
</trim>
|
||||
values
|
||||
@@ -421,8 +421,8 @@
|
||||
#{tradeDate,jdbcType=VARCHAR},
|
||||
#{tradeAmount,jdbcType=DECIMAL},
|
||||
#{tradeFee,jdbcType=DECIMAL},
|
||||
#{createTime,jdbcType=TIMESTAMP},
|
||||
#{updateTime,jdbcType=TIMESTAMP},
|
||||
<!--#{createTime,jdbcType=TIMESTAMP},-->
|
||||
<!--#{updateTime,jdbcType=TIMESTAMP},-->
|
||||
#{delFlag,jdbcType=VARCHAR},
|
||||
</trim>
|
||||
on duplicate key update
|
||||
@@ -445,8 +445,8 @@
|
||||
trade_date = #{tradeDate,jdbcType=VARCHAR},
|
||||
trade_amount = #{tradeAmount,jdbcType=DECIMAL},
|
||||
trade_fee = #{tradeFee,jdbcType=DECIMAL},
|
||||
create_time = #{createTime,jdbcType=TIMESTAMP},
|
||||
update_time = #{updateTime,jdbcType=TIMESTAMP},
|
||||
<!--create_time = #{createTime,jdbcType=TIMESTAMP},-->
|
||||
<!--update_time = #{updateTime,jdbcType=TIMESTAMP},-->
|
||||
del_flag = #{delFlag,jdbcType=VARCHAR},
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
Reference in New Issue
Block a user