|
|
@@ -3669,7 +3669,7 @@ public class KwtWaybillOrderV1Service {
|
|
|
//修改物流订单数据
|
|
|
KwtLogisticsOrder kwtLogistics= kwtLogisticsOrderRepository.queryByLogisticsOrderId(subtask.getLOrderId());
|
|
|
//获取更新 订单状态
|
|
|
- KwtLogisticsOrder kwtLogisticsOrder = getKwtLogisticsOrder(kwtLogistics, subtask);
|
|
|
+ KwtLogisticsOrder kwtLogisticsOrder = getKwtLogisticsOrder(kwtLogistics, subtask,status);
|
|
|
boolean b1 = kwtLogisticsOrderRepository.updateById(kwtLogisticsOrder);
|
|
|
//如果物流订单状态是已完成需要通知贸易订单完成
|
|
|
|
|
|
@@ -4194,7 +4194,7 @@ public class KwtWaybillOrderV1Service {
|
|
|
}
|
|
|
|
|
|
@NotNull
|
|
|
- private KwtLogisticsOrder getKwtLogisticsOrder(KwtLogisticsOrder kwtLogistics, KwtWaybillOrderSubtask subtask) {
|
|
|
+ private KwtLogisticsOrder getKwtLogisticsOrder(KwtLogisticsOrder kwtLogistics, KwtWaybillOrderSubtask subtask,Integer status) {
|
|
|
if (Objects.isNull(kwtLogistics)){
|
|
|
throw new BusinessException("物流订单信息不存在");
|
|
|
}
|
|
|
@@ -4211,7 +4211,7 @@ public class KwtWaybillOrderV1Service {
|
|
|
kwtLogisticsOrder.setUnloadAmount(unloadAmount.add(subUnloadAmount));
|
|
|
|
|
|
//如果审核的状态是 完成，那么就要去查询物流订单状态是完结中，并且所有物流订单下的运单全部是完成或者取消如果是则更新状态为已完成
|
|
|
- if (Objects.equals(kwtLogistics.getStatus(), LogisticsOrderV1Enum.NEARING_COMPLETION.getCode())){
|
|
|
+ if (Objects.equals(kwtLogistics.getStatus(), LogisticsOrderV1Enum.NEARING_COMPLETION.getCode()) && Objects.equals(status,CarWaybillV1Enum.COMPLETED.getCode())){
|
|
|
List<KwtWaybillOrderSubtask> waybillOrderSubtasks = kwtWaybillOrderSubtaskRepository.queryByLogId(subtask.getLOrderId());
|
|
|
boolean b2 = waybillOrderSubtasks.stream()
|
|
|
.allMatch(x -> Arrays.asList(CarWaybillV1Enum.COMPLETED.getCode(), CarWaybillV1Enum.CANCELLED.getCode()).contains(x.getStatus()));
|
chenxiaofei