|
|
@@ -1186,14 +1186,7 @@ public class GatekeeperOrderService {
|
|
|
BigDecimal totalEntrustAmount = currentEntrust.subtract(subtractAmount);
|
|
|
// 确保已委托量不为负数
|
|
|
logisticsOrder.setEntrustAmount(totalEntrustAmount.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : totalEntrustAmount);
|
|
|
- //如果当前运单的物流订单下没有其它进行中的运单,则修改物流订单状态已完成
|
|
|
- if (Objects.equals(LogisticsOrderV1Enum.NEARING_COMPLETION.getCode(), logisticsOrder.getStatus())) {
|
|
|
- List<KwtWaybillOrder> waybillOrderList = waybillOrderRepository
|
|
|
- .findOneByLogOrderIdAndStatus(logisticsOrder.getId(), UNFINISHED_STATUSES, subtask.getWOrderId());
|
|
|
- if (CollectionUtils.isEmpty(waybillOrderList)) {
|
|
|
- logisticsOrder.setStatus(LogisticsOrderV1Enum.COMPLETED.getCode());
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
logisticsOrderRepository.updateById(logisticsOrder);
|
|
|
}
|
|
|
|