提交 51d39cfb authored 作者: huyufan's avatar huyufan

优化相关代码

上级 21f100d7
...@@ -337,12 +337,14 @@ public class OrderCancelServiceImpl implements OrderCancelService { ...@@ -337,12 +337,14 @@ public class OrderCancelServiceImpl implements OrderCancelService {
throw new RuntimeException("货主取消订单失败,原因:远程调用取消订单失败"); throw new RuntimeException("货主取消订单失败,原因:远程调用取消订单失败");
} }
for (OrderGoods orderGoods : orderGoodsList) { // for (OrderGoods orderGoods : orderGoodsList) {
OrderGoods update = new OrderGoods(); // OrderGoods update = new OrderGoods();
update.setId(orderGoods.getId()); // update.setId(orderGoods.getId());
update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode()); // update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
orderGoodsDao.updateEntityByKey(update); // orderGoodsDao.updateEntityByKey(update);
} // }
orderGoodsDao.batchUpdateOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode(),
orderGoodsList.stream().map(OrderGoods::getId).collect(Collectors.toList()))
} else { } else {
...@@ -439,19 +441,21 @@ public class OrderCancelServiceImpl implements OrderCancelService { ...@@ -439,19 +441,21 @@ public class OrderCancelServiceImpl implements OrderCancelService {
} else if (OrderEnum.Status.CANCELED.getCode().equals(orderInfoFeignVO.getOrderStatus())) { } else if (OrderEnum.Status.CANCELED.getCode().equals(orderInfoFeignVO.getOrderStatus())) {
//已取消 //已取消
// for (OrderGoods orderGoods : orderGoodsList) { List<Integer> ids = new LinkedList<>();
// truckDemandMap.put(orderGoods.getTruckDemand(), for (OrderGoods orderGoods : orderGoodsList) {
// truckDemandMap.get(orderGoods.getTruckDemand()) truckDemandMap.put(orderGoods.getTruckDemand(),
// .add(orderGoods.getResidueTransportWeight())); truckDemandMap.get(orderGoods.getTruckDemand())
//// OrderGoods update = new OrderGoods(); .add(orderGoods.getResidueTransportWeight()));
//// update.setId(orderGoods.getId()); ids.add(orderGoods.getId());
//// //TODO 补充批量更新接口 关闭货单状态 // OrderGoods update = new OrderGoods();
//// update.setResidueTransportWeight(BigDecimal.ZERO); // update.setId(orderGoods.getId());
// // //TODO 补充批量更新接口 关闭货单状态
//// update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode()); // update.setResidueTransportWeight(BigDecimal.ZERO);
// orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(BigDecimal.ZERO, BigDecimal.ZERO, orderGoods.getId());
// } // update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
orderGoodsDao.batchUpdateOrderGoodsWeight(BigDecimal.ZERO, orderGoodsList.stream().map(OrderGoods::getId).collect(Collectors.toList())); // orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(BigDecimal.ZERO, BigDecimal.ZERO, orderGoods.getId());
}
orderGoodsDao.batchUpdateOrderGoodsWeight(BigDecimal.ZERO, ids);
} }
...@@ -520,18 +524,20 @@ public class OrderCancelServiceImpl implements OrderCancelService { ...@@ -520,18 +524,20 @@ public class OrderCancelServiceImpl implements OrderCancelService {
} else if (OrderEnum.Status.CANCELED.getCode().equals(orderInfoFeignVO.getOrderStatus())) { } else if (OrderEnum.Status.CANCELED.getCode().equals(orderInfoFeignVO.getOrderStatus())) {
//已取消 //已取消
// for (OrderGoods orderGoods : orderGoodsList) { List<Integer> ids = new LinkedList<>();
// vehicleUsageMap.put(orderGoods.getVehicleUsage(), for (OrderGoods orderGoods : orderGoodsList) {
// vehicleUsageMap.get(orderGoods.getVehicleUsage()) vehicleUsageMap.put(orderGoods.getVehicleUsage(),
// .add(orderGoods.getResidueTransportWeight())); vehicleUsageMap.get(orderGoods.getVehicleUsage())
.add(orderGoods.getResidueTransportWeight()));
ids.add(orderGoods.getId());
// OrderGoods update = new OrderGoods(); // OrderGoods update = new OrderGoods();
// update.setId(orderGoods.getId()); // update.setId(orderGoods.getId());
// //TODO 补充批量更新接口 关闭货单状态 // //TODO 补充批量更新接口 关闭货单状态
// update.setResidueTransportWeight(BigDecimal.ZERO); // update.setResidueTransportWeight(BigDecimal.ZERO);
// //update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode()); // //update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode());
// orderGoodsDao.updateEntityByKey(update); // orderGoodsDao.updateEntityByKey(update);
// } }
orderGoodsDao.batchUpdateOrderGoodsWeight(BigDecimal.ZERO, orderGoodsList.stream().map(OrderGoods::getId).collect(Collectors.toList())); orderGoodsDao.batchUpdateOrderGoodsWeight(BigDecimal.ZERO, ids);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论