echo
/
route
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 无法删除行程的bug

This commit is contained in:
lulz1 2024-06-25 09:52:04 +08:00
parent dd98051feb
commit 89e91d9d39
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chint/application/in/OrderPublicController.java
View File

@ -81,7 +81,7 @@ public class OrderPublicController {
@ApiOperation("根据行程节点号删除")
@PostMapping("/leg/delete/legNo")
public Result<String> deleteLeg(@RequestBody DeleteLegData deleteLegData) {
orderApplicationService.deleteByLegNo(deleteLegData);
legDomainService.deleteByLegNo(deleteLegData.getLegNo());
return Result.Success(SUCCESS);
}

24
src/main/java/com/chint/application/services/OrderApplicationService.java
View File

@ -200,18 +200,18 @@ public class OrderApplicationService {
};
}
public void deleteByLegNo(DeleteLegData deleteLegData) {
String legNo = deleteLegData.getLegNo();
RouteOrder routeOrder = null;
if (legNo.contains("&")) {
String[] split = legNo.split("&");
routeOrder = routeRepository.findTempRouteOrderBySysCodeAndBillCode(split[1], split[2]);
}
if (routeOrder != null && routeOrder.getOrderStatus().equals(ORDER_STATUS_PREPARE)){
routeOrder.deleteLeg(legNo);
routeRepository.saveTempRouteOrder(routeOrder, 24L);
}
}
// public void deleteByLegNo(DeleteLegData deleteLegData) {
// String legNo = deleteLegData.getLegNo();
// RouteOrder routeOrder = null;
// if (legNo.contains("&")) {
// String[] split = legNo.split("&");
// routeOrder = routeRepository.findTempRouteOrderBySysCodeAndBillCode(split[1], split[2]);
// }
// if (routeOrder != null && routeOrder.getOrderStatus().equals(ORDER_STATUS_PREPARE)){
// routeOrder.deleteLeg(legNo);
// routeRepository.saveTempRouteOrder(routeOrder, 24L);
// }
// }
public RouteOrder deleteLegToOrder(DeleteLegData deleteLegData) {

13
src/main/java/com/chint/domain/service/LegDomainService.java
View File

@ -110,13 +110,14 @@ public class LegDomainService {
}
public void deleteByLegNo(String legNo) {
Leg byLegNo = legRepository.findByLegNo(legNo);
if (byLegNo == null) {
return;
RouteOrder routeOrder = null;
if (legNo.contains("&")) {
String[] split = legNo.split("&");
routeOrder = routeRepository.findTempRouteOrderBySysCodeAndBillCode(split[1], split[2]);
}
RouteOrder routeOrder = routeRepository.queryById(byLegNo.getRouteId()).reloadStatus();
if (routeOrder.getOrderStatus().equals(ORDER_STATUS_PREPARE)) {
legRepository.deleteById(byLegNo);
if (routeOrder != null && routeOrder.getOrderStatus().equals(ORDER_STATUS_PREPARE)){
routeOrder.deleteLeg(legNo);
routeRepository.saveTempRouteOrder(routeOrder, 24L);
}
}