sczx_group/sczx_web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

手动结束订单bug

Browse Source
This commit is contained in:
19173159168
2025-09-07 13:19:01 +08:00
parent 37b9e75ec6
commit 7f50080a3b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java
View File

@ -265,7 +265,7 @@ public class ZcOrderMainServiceImpl implements IZcOrderMainService
zcOrderMain.setUpdateBy(ShiroUtils.getSysUser().getLoginName()); zcOrderMain.setUpdateBy(ShiroUtils.getSysUser().getLoginName());
zcOrderMain.setUpdateTime(DateUtils.getNowDate()); zcOrderMain.setUpdateTime(DateUtils.getNowDate());
zcOrderMain.setEndOrderTime(DateUtils.getNowDate()); zcOrderMain.setEndOrderTime(DateUtils.getNowDate());
zcOrderMain.setActEndRentTime(DateUtils.getNowDate());
// 计算逾期费用 // 计算逾期费用
long overdueDays = DateUtils.daysBetween(queryOrder.getEndRentTime(), DateUtils.getNowDate()); long overdueDays = DateUtils.daysBetween(queryOrder.getEndRentTime(), DateUtils.getNowDate());
if (overdueDays > 0) { if (overdueDays > 0) {

4
ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml
View File

@ -236,7 +236,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isDepositFree != null">is_deposit_free = #{isDepositFree},</if> <if test="isDepositFree != null">is_deposit_free = #{isDepositFree},</if>
<if test="isAutoDeduct != null">is_auto_deduct = #{isAutoDeduct},</if> <if test="isAutoDeduct != null">is_auto_deduct = #{isAutoDeduct},</if>
<if test="firstOrderTime != null">first_order_time = #{firstOrderTime},</if> <if test="firstOrderTime != null">first_order_time = #{firstOrderTime},</if>
<if test="startRentTime != null">start_rent_time = #{startRentTime},</if> <if test="startRentTime != null and startRentTime != ''">start_rent_time = #{startRentTime},</if>
<if test="overdueDays != null">overdue_days = #{overdueDays},</if> <if test="overdueDays != null">overdue_days = #{overdueDays},</if>
<if test="renewalTimes != null">renewal_times = #{renewalTimes},</if> <if test="renewalTimes != null">renewal_times = #{renewalTimes},</if>
<if test="chargeTimes != null">charge_times = #{chargeTimes},</if> <if test="chargeTimes != null">charge_times = #{chargeTimes},</if>
@ -244,7 +244,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="rentBatteyRuleId != null">rent_battey_rule_id = #{rentBatteyRuleId},</if> <if test="rentBatteyRuleId != null">rent_battey_rule_id = #{rentBatteyRuleId},</if>
<if test="orderAmount != null">order_amount = #{orderAmount},</if> <if test="orderAmount != null">order_amount = #{orderAmount},</if>
<if test="overdueAmount != null">overdue_amount = #{overdueAmount},</if> <if test="overdueAmount != null">overdue_amount = #{overdueAmount},</if>
<if test="endOrderTime != null">end_order_time = #{endOrderTime},</if> <if test="endOrderTime != null and endOrderTime != ''">end_order_time = #{endOrderTime},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if> <if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>

2
ruoyi-admin/src/main/resources/templates/operation/car/car.html
View File

@ -160,7 +160,7 @@
}, },
{ {
field: 'status', field: 'status',
title: '状态', title: '车辆状态',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(statusDatas, value); return $.table.selectDictLabel(statusDatas, value);
} }