提交 644b5bf9 authored 作者: 李瑞鑫's avatar 李瑞鑫

增吨减吨代码优化

上级 4661367a
...@@ -622,7 +622,6 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild, ...@@ -622,7 +622,6 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
return list(lQrWrapper() return list(lQrWrapper()
.eq(OrderChild :: getOrderNo,orderNo) .eq(OrderChild :: getOrderNo,orderNo)
.in(OrderChild :: getStatus,status) .in(OrderChild :: getStatus,status)
.orderByAsc(OrderChild::getId)
); );
} }
...@@ -630,7 +629,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild, ...@@ -630,7 +629,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
public void updateBatchOwnerCancel(List<String> childNos){ public void updateBatchOwnerCancel(List<String> childNos){
update(lUdWrapper() update(lUdWrapper()
.in(OrderChild::getChildNo, childNos) .in(OrderChild::getChildNo, childNos)
.set(OrderChild::getStatus, OrderChildEnum.Status.DRIVER_CANCEL.getCode()) .set(OrderChild::getStatus, OrderChildEnum.Status.OWNER_CANCEL.getCode())
.set(OrderChild::getCancelTime,LocalDateTime.now()) .set(OrderChild::getCancelTime,LocalDateTime.now())
.set(OrderChild::getFinishTime,LocalDateTime.now()) .set(OrderChild::getFinishTime,LocalDateTime.now())
.set(OrderChild::getCancelRemark,"货主减少拉运吨数,系统自动取消") .set(OrderChild::getCancelRemark,"货主减少拉运吨数,系统自动取消")
......
...@@ -2449,7 +2449,7 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -2449,7 +2449,7 @@ public class OrderChildServiceImpl implements OrderChildService {
arriveBeforeStatus.add(OrderChildEnum.Status.PAY.getCode()); arriveBeforeStatus.add(OrderChildEnum.Status.PAY.getCode());
arriveBeforeStatus.add(OrderChildEnum.Status.GO_TO_SEND.getCode()); arriveBeforeStatus.add(OrderChildEnum.Status.GO_TO_SEND.getCode());
List<String> childNos = new ArrayList<>();//取消运单ids List<String> childNos;//取消运单
//未到达货源地之前运单(不包括取消) //未到达货源地之前运单(不包括取消)
List<OrderChild> arriveBeforeOrderChild = orderChildDao.listByOrderNo(param.getOrderNo(),arriveBeforeStatus); List<OrderChild> arriveBeforeOrderChild = orderChildDao.listByOrderNo(param.getOrderNo(),arriveBeforeStatus);
if(orderedWeight.compareTo(availableWeight) > 0){//已挂吨数大于可拉运吨数 取消未到达货源地的运单 if(orderedWeight.compareTo(availableWeight) > 0){//已挂吨数大于可拉运吨数 取消未到达货源地的运单
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论