dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
Vinjor 2025-01-10 10:25:35 +08:00
parent 3949466a11
commit 7259ae143e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
View File

@ -610,7 +610,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
// 更新订单状态 // 更新订单状态
RepairOrderInfo one = repairOrderInfoService.getOne(new LambdaQueryWrapper<RepairOrderInfo>().eq(RepairOrderInfo::getGoodsId, repairTicketsRespVO.getId())); RepairOrderInfo one = repairOrderInfoService.getOne(new LambdaQueryWrapper<RepairOrderInfo>().eq(RepairOrderInfo::getGoodsId, repairTicketsRespVO.getId()));
if (ObjectUtil.isEmpty(one)) { if (ObjectUtil.isEmpty(one)) {
throw exception0(500, "系统异常"); throw exception0(500, "未找到该笔订单");
} }
RepairOrderInfo repairOrderInfo = new RepairOrderInfo(); RepairOrderInfo repairOrderInfo = new RepairOrderInfo();
repairOrderInfo.setId(one.getId()); repairOrderInfo.setId(one.getId());
@ -622,7 +622,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
// 线上支付需要在回调中去更新状态工单状态和订单状态 // 线上支付需要在回调中去更新状态工单状态和订单状态
}else { }else {
// 线下支付和签单、挂账才是直接结束工单和订单 // 线下支付和签单、挂账等其他支付方式才是直接结束工单和订单
DlRepairTickets repairTickets = this.getById(repairTicketsRespVO.getId()); DlRepairTickets repairTickets = this.getById(repairTicketsRespVO.getId());
if("1".equals(repairTickets.getIsHandover())){ if("1".equals(repairTickets.getIsHandover())){
//已交车，已结算。那么工单状态改为 已完成 //已交车，已结算。那么工单状态改为 已完成
@ -630,12 +630,13 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
//工单结束 //工单结束
repairTicketsRespVO.setIsFinish("1"); repairTicketsRespVO.setIsFinish("1");
} }
// 更新工单 // 设置订单支付时间和支付结果
baseMapper.updateById(repairTicketsRespVO);
// 更新订单
repairOrderInfo.setPayTime(LocalDateTime.now()); repairOrderInfo.setPayTime(LocalDateTime.now());
repairOrderInfo.setOrderStatus("1"); repairOrderInfo.setOrderStatus("1");
} }
// 更新工单
baseMapper.updateById(repairTicketsRespVO);
//更新订单
repairOrderInfoService.updateById(repairOrderInfo); repairOrderInfoService.updateById(repairOrderInfo);
// 记录日志 // 记录日志
repairRecordsService.saveRepairRecord(one.getGoodsId(), null, RecordTypeEnum.JS.getCode(), "线下支付结算", null); repairRecordsService.saveRepairRecord(one.getGoodsId(), null, RecordTypeEnum.JS.getCode(), "线下支付结算", null);

4
dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
View File

@ -178,8 +178,8 @@
billing_remark, billing_remark,
handle_name, handle_name,
handle_mobile, handle_mobile,
nextInspection_date, next_inspection_date,
insuranceExpiry_date, insurance_expiry_date,
insurance_type, insurance_type,
jiaoqiang, jiaoqiang,
shangye shangye