lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.njzscloud.com/lzq/njzscloud into dev

master
ljw 2026-01-08 13:45:18 +08:00
parent 2e6e8da7aa e6bb4439e1
commit 9869fe9f73
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
View File

@ -118,7 +118,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
private final BizTruckService bizTruckService; private final BizTruckService bizTruckService;
private final DiscountManageService discountManageService; private final DiscountManageService discountManageService;
private final HsoaService hsoaService; private final HsoaService hsoaService;
private final DictItemService dictItemService; private final DictItemService dictItemService;
private final AtomicBoolean test_thread_running = new AtomicBoolean(false); private final AtomicBoolean test_thread_running = new AtomicBoolean(false);
Thread test_thread = null; Thread test_thread = null;
@Value("${app.check-gps:false}") @Value("${app.check-gps:false}")
@ -584,6 +584,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
return PageResult.of(baseMapper.paging(page, ew)); return PageResult.of(baseMapper.paging(page, ew));
} }
@Transactional(rollbackFor = Exception.class)
public void audit(AuditOrderParam auditOrderParam) { public void audit(AuditOrderParam auditOrderParam) {
OrderPagingResult detail = detail(auditOrderParam.getId()); OrderPagingResult detail = detail(auditOrderParam.getId());
Assert.notNull(detail, () -> Exceptions.clierr("订单不存在")); Assert.notNull(detail, () -> Exceptions.clierr("订单不存在"));
@ -670,6 +671,10 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
.setCertificateSn(certificateSn) .setCertificateSn(certificateSn)
.setCheckStatus(checkStatus) .setCheckStatus(checkStatus)
); );
if (newAuditStatus == AuditStatus.BoHui) {
baseMapper.busyDriver(detail.getDriverId(), Boolean.FALSE);
baseMapper.busyTruck(detail.getTruckId(), Boolean.FALSE);
}
OrderCategory orderCategory = detail.getOrderCategory(); OrderCategory orderCategory = detail.getOrderCategory();
if (orderCategory == OrderCategory.DuanBoRu) return; if (orderCategory == OrderCategory.DuanBoRu) return;
// auditStatus为市待审核状态通知市，通过状态通知司机 // auditStatus为市待审核状态通知市，通过状态通知司机