Skip to content

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

修改BUG

上级 84dbbeeb
显示空白字符变更
内嵌 并排
正在显示 包含 0 行增加 和 12 行删除
performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java
浏览文件 @ 19f5f03c
...@@ -637,7 +637,6 @@ public class OrderCancelServiceImpl implements OrderCancelService { ...@@ -637,7 +637,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
truckDemandMap.put(orderGoods.getTruckDemand(), truckDemandMap.put(orderGoods.getTruckDemand(),
truckDemandMap.get(orderGoods.getTruckDemand()) truckDemandMap.get(orderGoods.getTruckDemand())
.add(orderGoods.getResidueTransportWeight())); .add(orderGoods.getResidueTransportWeight()));
//update.setResidueTransportWeight(BigDecimal.ZERO);
orderGoodsDao.updateEntityByKey(update); orderGoodsDao.updateEntityByKey(update);
} }
} else { } else {
...@@ -647,7 +646,6 @@ public class OrderCancelServiceImpl implements OrderCancelService { ...@@ -647,7 +646,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
vehicleUsageMap.put(orderGoods.getVehicleUsage(), vehicleUsageMap.put(orderGoods.getVehicleUsage(),
vehicleUsageMap.get(orderGoods.getVehicleUsage()) vehicleUsageMap.get(orderGoods.getVehicleUsage())
.add(orderGoods.getResidueTransportWeight())); .add(orderGoods.getResidueTransportWeight()));
//update.setResidueTransportWeight(BigDecimal.ZERO);
orderGoodsDao.updateEntityByKey(update); orderGoodsDao.updateEntityByKey(update);
} }
} }
...@@ -679,23 +677,15 @@ public class OrderCancelServiceImpl implements OrderCancelService { ...@@ -679,23 +677,15 @@ public class OrderCancelServiceImpl implements OrderCancelService {
if (!orderInfoFeign.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) { if (!orderInfoFeign.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
for (OrderGoods orderGoods : orderGoodsList) { for (OrderGoods orderGoods : orderGoodsList) {
OrderGoods update = new OrderGoods();
update.setId(orderGoods.getId());
truckDemandMap.put(orderGoods.getTruckDemand(), truckDemandMap.put(orderGoods.getTruckDemand(),
truckDemandMap.get(orderGoods.getTruckDemand()) truckDemandMap.get(orderGoods.getTruckDemand())
.add(orderGoods.getResidueTransportWeight())); .add(orderGoods.getResidueTransportWeight()));
//update.setResidueTransportWeight(BigDecimal.ZERO);
orderGoodsDao.updateEntityByKey(update);
} }
} else { } else {
for (OrderGoods orderGoods : orderGoodsList) { for (OrderGoods orderGoods : orderGoodsList) {
OrderGoods update = new OrderGoods();
update.setId(orderGoods.getId());
vehicleUsageMap.put(orderGoods.getVehicleUsage(), vehicleUsageMap.put(orderGoods.getVehicleUsage(),
vehicleUsageMap.get(orderGoods.getVehicleUsage()) vehicleUsageMap.get(orderGoods.getVehicleUsage())
.add(orderGoods.getResidueTransportWeight())); .add(orderGoods.getResidueTransportWeight()));
//update.setResidueTransportWeight(BigDecimal.ZERO);
orderGoodsDao.updateEntityByKey(update);
} }
} }
//归还吨数 //归还吨数
...@@ -738,7 +728,6 @@ public class OrderCancelServiceImpl implements OrderCancelService { ...@@ -738,7 +728,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
truckDemandMap.put(orderGoods.getTruckDemand(), truckDemandMap.put(orderGoods.getTruckDemand(),
truckDemandMap.get(orderGoods.getTruckDemand()) truckDemandMap.get(orderGoods.getTruckDemand())
.add(orderGoods.getResidueTransportWeight())); .add(orderGoods.getResidueTransportWeight()));
//update.setResidueTransportWeight(BigDecimal.ZERO);
if (CollectionUtil.isNotEmpty(orderChildMap.get(orderGoods.getOrderGoodsNo()))) { if (CollectionUtil.isNotEmpty(orderChildMap.get(orderGoods.getOrderGoodsNo()))) {
BigDecimal childSum = orderChildMap.get(orderGoods.getOrderGoodsNo()).stream() BigDecimal childSum = orderChildMap.get(orderGoods.getOrderGoodsNo()).stream()
.map(OrderChild::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add); .map(OrderChild::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
...@@ -762,7 +751,6 @@ public class OrderCancelServiceImpl implements OrderCancelService { ...@@ -762,7 +751,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
vehicleUsageMap.put(orderGoods.getVehicleUsage(), vehicleUsageMap.put(orderGoods.getVehicleUsage(),
vehicleUsageMap.get(orderGoods.getVehicleUsage()) vehicleUsageMap.get(orderGoods.getVehicleUsage())
.add(orderGoods.getResidueTransportWeight())); .add(orderGoods.getResidueTransportWeight()));
//update.setResidueTransportWeight(BigDecimal.ZERO);
if (CollectionUtil.isNotEmpty(orderChildMap.get(orderGoods.getOrderGoodsNo()))) { if (CollectionUtil.isNotEmpty(orderChildMap.get(orderGoods.getOrderGoodsNo()))) {
BigDecimal childSum = orderChildMap.get(orderGoods.getOrderGoodsNo()).stream() BigDecimal childSum = orderChildMap.get(orderGoods.getOrderGoodsNo()).stream()
.map(OrderChild::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add); .map(OrderChild::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论