优化相关代码

performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java

@@ -337,12 +337,14 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 throw new RuntimeException("货主取消订单失败,原因：远程调用取消订单失败");
             }
 
-            for (OrderGoods orderGoods : orderGoodsList) {
-                OrderGoods update = new OrderGoods();
-                update.setId(orderGoods.getId());
-                update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
-                orderGoodsDao.updateEntityByKey(update);
-            }
+//            for (OrderGoods orderGoods : orderGoodsList) {
+//                OrderGoods update = new OrderGoods();
+//                update.setId(orderGoods.getId());
+//                update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
+//                orderGoodsDao.updateEntityByKey(update);
+//            }
+            orderGoodsDao.batchUpdateOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode(),
+                    orderGoodsList.stream().map(OrderGoods::getId).collect(Collectors.toList()))
 
         } else {
 
@@ -439,19 +441,21 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
             } else if (OrderEnum.Status.CANCELED.getCode().equals(orderInfoFeignVO.getOrderStatus())) {
                 //已取消
-//                for (OrderGoods orderGoods : orderGoodsList) {
-//                    truckDemandMap.put(orderGoods.getTruckDemand(),
-//                            truckDemandMap.get(orderGoods.getTruckDemand())
-//                                    .add(orderGoods.getResidueTransportWeight()));
-////                    OrderGoods update = new OrderGoods();
-////                    update.setId(orderGoods.getId());
-////                    //TODO 补充批量更新接口  关闭货单状态
-////                    update.setResidueTransportWeight(BigDecimal.ZERO);
-//
-////                    update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
-//                    orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(BigDecimal.ZERO, BigDecimal.ZERO, orderGoods.getId());
-//                }
-                orderGoodsDao.batchUpdateOrderGoodsWeight(BigDecimal.ZERO, orderGoodsList.stream().map(OrderGoods::getId).collect(Collectors.toList()));
+                List<Integer> ids = new LinkedList<>();
+                for (OrderGoods orderGoods : orderGoodsList) {
+                    truckDemandMap.put(orderGoods.getTruckDemand(),
+                            truckDemandMap.get(orderGoods.getTruckDemand())
+                                    .add(orderGoods.getResidueTransportWeight()));
+                    ids.add(orderGoods.getId());
+//                    OrderGoods update = new OrderGoods();
+//                    update.setId(orderGoods.getId());
+//                    //TODO 补充批量更新接口  关闭货单状态
+//                    update.setResidueTransportWeight(BigDecimal.ZERO);
+
+//                    update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
+                   // orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(BigDecimal.ZERO, BigDecimal.ZERO, orderGoods.getId());
+                }
+                orderGoodsDao.batchUpdateOrderGoodsWeight(BigDecimal.ZERO, ids);
 
             }
 
@@ -520,18 +524,20 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
             } else if (OrderEnum.Status.CANCELED.getCode().equals(orderInfoFeignVO.getOrderStatus())) {
                 //已取消
-//                for (OrderGoods orderGoods : orderGoodsList) {
-//                    vehicleUsageMap.put(orderGoods.getVehicleUsage(),
-//                            vehicleUsageMap.get(orderGoods.getVehicleUsage())
-//                                    .add(orderGoods.getResidueTransportWeight()));
+                List<Integer> ids = new LinkedList<>();
+                for (OrderGoods orderGoods : orderGoodsList) {
+                    vehicleUsageMap.put(orderGoods.getVehicleUsage(),
+                            vehicleUsageMap.get(orderGoods.getVehicleUsage())
+                                    .add(orderGoods.getResidueTransportWeight()));
+                    ids.add(orderGoods.getId());
 //                    OrderGoods update = new OrderGoods();
 //                    update.setId(orderGoods.getId());
 //                    //TODO 补充批量更新接口  关闭货单状态
 //                    update.setResidueTransportWeight(BigDecimal.ZERO);
 //                    //update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode());
 //                    orderGoodsDao.updateEntityByKey(update);
-//                }
-                orderGoodsDao.batchUpdateOrderGoodsWeight(BigDecimal.ZERO, orderGoodsList.stream().map(OrderGoods::getId).collect(Collectors.toList()));
+                }
+                orderGoodsDao.batchUpdateOrderGoodsWeight(BigDecimal.ZERO, ids);
 
             }