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-08-24 19:25:40 +08:00
parent 6bd15e4627
commit 2af3951b94
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,9 +122,10 @@ public class ZcOrderMainServiceImpl implements IZcOrderMainService
zcOrderMainMapper.deleteZcOrderSubByOrderId(orderId); zcOrderMainMapper.deleteZcOrderSubByOrderId(orderId);
return zcOrderMainMapper.deleteZcOrderMainByOrderId(orderId); return zcOrderMainMapper.deleteZcOrderMainByOrderId(orderId);
} }
@Transactional
@Override @Override
public int updateManualEndOrder(Long orderId) { public int updateManualEndOrder(Long orderId) {
ZcOrderMain queryOrder = zcOrderMainMapper.selectZcOrderMainByOrderId(orderId);
//订单手动结束逻辑待完善 //订单手动结束逻辑待完善
//1、修改订单状态，2计算逾期费用(如果有逾期)，3、释放车辆状态 //1、修改订单状态，2计算逾期费用(如果有逾期)，3、释放车辆状态
//1、修改订单状态 //1、修改订单状态
@ -134,7 +135,7 @@ public class ZcOrderMainServiceImpl implements IZcOrderMainService
zcOrderMain.setUpdateBy(ShiroUtils.getSysUser().getLoginName()); zcOrderMain.setUpdateBy(ShiroUtils.getSysUser().getLoginName());
zcOrderMain.setUpdateTime(DateUtils.getNowDate()); zcOrderMain.setUpdateTime(DateUtils.getNowDate());
// 2计算逾期费用 // 2计算逾期费用
long overdueDays = DateUtils.daysBetween(DateUtils.getNowDate(),zcOrderMain.getEndRentTime()); long overdueDays = DateUtils.daysBetween(DateUtils.getNowDate(),queryOrder.getEndRentTime());
if(overdueDays > 0) { if(overdueDays > 0) {
zcOrderMain.setOverdueDays(overdueDays); zcOrderMain.setOverdueDays(overdueDays);
zcOrderMain.setOverdueAmount(zcOrderMain.getOverdueFee().multiply(new BigDecimal(zcOrderMain.getOverdueDays()))); zcOrderMain.setOverdueAmount(zcOrderMain.getOverdueFee().multiply(new BigDecimal(zcOrderMain.getOverdueDays())));

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

@ -28,7 +28,7 @@
<li> <li>
<label>所属运营商：</label> <label>所属运营商：</label>
<select name="operatingId" id="operatingId" > <select name="operatorId" id="operatorId" >
<option value="">请选择所属运营商</option> <option value="">请选择所属运营商</option>
<option th:each="company : ${companyList}" th:value="${company.id}" th:text="${company.companyName}"></option> <option th:each="company : ${companyList}" th:value="${company.id}" th:text="${company.companyName}"></option>
</select> </select>