Merge branch 'dev' of https://git.njzscloud.com/lzq/njzscloud into dev
commit
9869fe9f73
|
|
@ -584,6 +584,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
|
|||
return PageResult.of(baseMapper.paging(page, ew));
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void audit(AuditOrderParam auditOrderParam) {
|
||||
OrderPagingResult detail = detail(auditOrderParam.getId());
|
||||
Assert.notNull(detail, () -> Exceptions.clierr("订单不存在"));
|
||||
|
|
@ -670,6 +671,10 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
|
|||
.setCertificateSn(certificateSn)
|
||||
.setCheckStatus(checkStatus)
|
||||
);
|
||||
if (newAuditStatus == AuditStatus.BoHui) {
|
||||
baseMapper.busyDriver(detail.getDriverId(), Boolean.FALSE);
|
||||
baseMapper.busyTruck(detail.getTruckId(), Boolean.FALSE);
|
||||
}
|
||||
OrderCategory orderCategory = detail.getOrderCategory();
|
||||
if (orderCategory == OrderCategory.DuanBoRu) return;
|
||||
// auditStatus为市待审核状态通知市,通过状态通知司机
|
||||
|
|
|
|||
Loading…
Reference in New Issue