Skip to content

C
clx-performance
提交 84dbbeeb authored 作者: huyufan's avatar huyufan
浏览文件
操作

修改BUG

上级 430fd808
隐藏空白字符变更
内嵌 并排
正在显示 包含 18 行增加 和 18 行删除
performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java
浏览文件 @ 84dbbeeb
......@@ -218,21 +218,21 @@ public class OrderCancelServiceImpl implements OrderCancelService {
truckDemandMap.get(orderGoods.getTruckDemand())
.add(orderGoods.getResidueTransportWeight().add(sum)));
orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(BigDecimal.ZERO, sum, orderGoods.getId());
orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(sum, sum, orderGoods.getId());
}
} else if (OrderEnum.Status.CANCELED.getCode().equals(orderInfoFeignVO.getOrderStatus())) {
//已取消
List<Integer> ids = new LinkedList<>();
//List<Integer> ids = new LinkedList<>();
for (OrderGoods orderGoods : orderGoodsList) {
truckDemandMap.put(orderGoods.getTruckDemand(),
truckDemandMap.get(orderGoods.getTruckDemand())
.add(orderGoods.getResidueTransportWeight()));
ids.add(orderGoods.getId());
}
if (CollectionUtil.isNotEmpty(ids)) {
orderGoodsDao.batchUpdateOrderGoodsWeight(BigDecimal.ZERO, ids);
//ids.add(orderGoods.getId());
}
// if (CollectionUtil.isNotEmpty(ids)) {
// orderGoodsDao.batchUpdateOrderGoodsWeight(BigDecimal.ZERO, ids);
// }
}
......@@ -299,22 +299,22 @@ public class OrderCancelServiceImpl implements OrderCancelService {
vehicleUsageMap.get(orderGoods.getVehicleUsage())
.add(orderGoods.getResidueTransportWeight().add(sum)));
orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(BigDecimal.ZERO, sum, orderGoods.getId());
orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(sum, sum, orderGoods.getId());
}
} else if (OrderEnum.Status.CANCELED.getCode().equals(orderInfoFeignVO.getOrderStatus())) {
//已取消
List<Integer> ids = new LinkedList<>();
//List<Integer> ids = new LinkedList<>();
for (OrderGoods orderGoods : orderGoodsList) {
vehicleUsageMap.put(orderGoods.getVehicleUsage(),
vehicleUsageMap.get(orderGoods.getVehicleUsage())
.add(orderGoods.getResidueTransportWeight()));
ids.add(orderGoods.getId());
}
if (CollectionUtil.isNotEmpty(ids)) {
orderGoodsDao.batchUpdateOrderGoodsWeight(BigDecimal.ZERO, ids);
//ids.add(orderGoods.getId());
}
// if (CollectionUtil.isNotEmpty(ids)) {
// orderGoodsDao.batchUpdateOrderGoodsWeight(BigDecimal.ZERO, ids);
// }
}
......@@ -637,7 +637,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
truckDemandMap.put(orderGoods.getTruckDemand(),
truckDemandMap.get(orderGoods.getTruckDemand())
.add(orderGoods.getResidueTransportWeight()));
update.setResidueTransportWeight(BigDecimal.ZERO);
//update.setResidueTransportWeight(BigDecimal.ZERO);
orderGoodsDao.updateEntityByKey(update);
}
} else {
......@@ -647,7 +647,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
vehicleUsageMap.put(orderGoods.getVehicleUsage(),
vehicleUsageMap.get(orderGoods.getVehicleUsage())
.add(orderGoods.getResidueTransportWeight()));
update.setResidueTransportWeight(BigDecimal.ZERO);
//update.setResidueTransportWeight(BigDecimal.ZERO);
orderGoodsDao.updateEntityByKey(update);
}
}
......@@ -684,7 +684,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
truckDemandMap.put(orderGoods.getTruckDemand(),
truckDemandMap.get(orderGoods.getTruckDemand())
.add(orderGoods.getResidueTransportWeight()));
update.setResidueTransportWeight(BigDecimal.ZERO);
//update.setResidueTransportWeight(BigDecimal.ZERO);
orderGoodsDao.updateEntityByKey(update);
}
} else {
......@@ -694,7 +694,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
vehicleUsageMap.put(orderGoods.getVehicleUsage(),
vehicleUsageMap.get(orderGoods.getVehicleUsage())
.add(orderGoods.getResidueTransportWeight()));
update.setResidueTransportWeight(BigDecimal.ZERO);
//update.setResidueTransportWeight(BigDecimal.ZERO);
orderGoodsDao.updateEntityByKey(update);
}
}
......@@ -738,7 +738,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
truckDemandMap.put(orderGoods.getTruckDemand(),
truckDemandMap.get(orderGoods.getTruckDemand())
.add(orderGoods.getResidueTransportWeight()));
update.setResidueTransportWeight(BigDecimal.ZERO);
//update.setResidueTransportWeight(BigDecimal.ZERO);
if (CollectionUtil.isNotEmpty(orderChildMap.get(orderGoods.getOrderGoodsNo()))) {
BigDecimal childSum = orderChildMap.get(orderGoods.getOrderGoodsNo()).stream()
.map(OrderChild::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
......@@ -762,7 +762,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
vehicleUsageMap.put(orderGoods.getVehicleUsage(),
vehicleUsageMap.get(orderGoods.getVehicleUsage())
.add(orderGoods.getResidueTransportWeight()));
update.setResidueTransportWeight(BigDecimal.ZERO);
//update.setResidueTransportWeight(BigDecimal.ZERO);
if (CollectionUtil.isNotEmpty(orderChildMap.get(orderGoods.getOrderGoodsNo()))) {
BigDecimal childSum = orderChildMap.get(orderGoods.getOrderGoodsNo()).stream()
.map(OrderChild::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论