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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
View File

@@ -708,6 +708,7 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
if (selectResult != null) { if (selectResult != null) {
settleOrderReport.setId(selectResult.getId()); settleOrderReport.setId(selectResult.getId());
settleOrderReport.setSettleCode(selectResult.getSettleCode()); settleOrderReport.setSettleCode(selectResult.getSettleCode());
// settleOrderReport.setCreateTime(selectResult.getCreateTime()); // 沿用原来的创建时间
} }
settleOrderReport.setDelFlag(DelFlagEnum.NORMAL.getValue()); settleOrderReport.setDelFlag(DelFlagEnum.NORMAL.getValue());
// 订单日报 新增或更新 // 订单日报 新增或更新

12
jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml
View File

@@ -397,8 +397,8 @@
trade_date, trade_date,
trade_amount, trade_amount,
trade_fee, trade_fee,
create_time, <!-- create_time,-->
update_time, <!-- update_time,-->
del_flag, del_flag,
</trim> </trim>
values values
@@ -421,8 +421,8 @@
#{tradeDate,jdbcType=VARCHAR}, #{tradeDate,jdbcType=VARCHAR},
#{tradeAmount,jdbcType=DECIMAL}, #{tradeAmount,jdbcType=DECIMAL},
#{tradeFee,jdbcType=DECIMAL}, #{tradeFee,jdbcType=DECIMAL},
#{createTime,jdbcType=TIMESTAMP}, <!--#{createTime,jdbcType=TIMESTAMP},-->
#{updateTime,jdbcType=TIMESTAMP}, <!--#{updateTime,jdbcType=TIMESTAMP},-->
#{delFlag,jdbcType=VARCHAR}, #{delFlag,jdbcType=VARCHAR},
</trim> </trim>
on duplicate key update on duplicate key update
@@ -445,8 +445,8 @@
trade_date = #{tradeDate,jdbcType=VARCHAR}, trade_date = #{tradeDate,jdbcType=VARCHAR},
trade_amount = #{tradeAmount,jdbcType=DECIMAL}, trade_amount = #{tradeAmount,jdbcType=DECIMAL},
trade_fee = #{tradeFee,jdbcType=DECIMAL}, trade_fee = #{tradeFee,jdbcType=DECIMAL},
create_time = #{createTime,jdbcType=TIMESTAMP}, <!--create_time = #{createTime,jdbcType=TIMESTAMP},-->
update_time = #{updateTime,jdbcType=TIMESTAMP}, <!--update_time = #{updateTime,jdbcType=TIMESTAMP},-->
del_flag = #{delFlag,jdbcType=VARCHAR}, del_flag = #{delFlag,jdbcType=VARCHAR},
</trim> </trim>
</insert> </insert>