使用结算金额计算收入金额

This commit is contained in:
Guoqs
2024-11-12 15:32:11 +08:00
parent 0df0e610fd
commit 5c6e9a5269
2 changed files with 7 additions and 6 deletions

View File

@@ -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());
// 订单日报 新增或更新

View File

@@ -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>