订单修改bug

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -25,10 +25,12 @@ import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.OrderItem;
 import com.xxfc.platform.order.entity.OrderTemplate;
 import com.xxfc.platform.order.pojo.OrderAccompanyDTO;
+import com.xxfc.platform.order.pojo.order.OrderItemDTO;
 import com.xxfc.platform.order.pojo.order.RentVehicleBO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.feign.ThirdFeign;
+import com.xxfc.platform.vehicle.constant.AccompanyingItemType;
 import com.xxfc.platform.vehicle.entity.AccompanyingItem;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
@@ -157,19 +159,45 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         }
 
         //插入随声物品item
-        Map<String, AccompanyingItemVo> accompanyingItemMap = vehicleFeign.listAccompanyingItem().getData()
-                .parallelStream().collect(Collectors.toMap(en -> en.getId().toString(), en -> en));
+        List<OrderAccompanyDTO> oads = new ArrayList<OrderAccompanyDTO>();
+        List<AccompanyingItemVo> accompanyingItemList = vehicleFeign.listAccompanyingItem().getData();
+//        Map<String, AccompanyingItemVo> accompanyingItemMap = vehicleFeign.listAccompanyingItem().getData()
+//                .parallelStream().collect(Collectors.toMap(en -> en.getId().toString(), en -> en));
         if(null == bo.getAccompanyItems()) {
             bo.setAccompanyItems(new ArrayList<OrderAccompanyDTO>());
         }
-        for(OrderAccompanyDTO oad : bo.getAccompanyItems()) {
-            AccompanyingItemVo aiv = accompanyingItemMap.get(oad.getId().toString());
-            oad.setName(aiv.getName());
-            oad.setUnit(aiv.getUnit());
-            oad.setUnitPrice(aiv.getPrice());
-            oad.setNum(aiv.getNumber());
-            oad.setTotalAmount(oad.getUnitPrice().multiply(new BigDecimal(oad.getNum().toString())));
-        }
+        Map<String, OrderAccompanyDTO> orderAccompanyDTOMap = bo.getAccompanyItems()
+                .parallelStream().collect(Collectors.toMap(en -> en.getId().toString(), en -> en));
+
+        for(AccompanyingItemVo aiv : accompanyingItemList) {
+            if(AccompanyingItemType.TOOL.getCode().equals(aiv.getType())
+                || AccompanyingItemType.EQUIPMENT.getCode().equals(aiv.getType())) {
+                OrderAccompanyDTO orderAccompanyDTO = new OrderAccompanyDTO();
+                orderAccompanyDTO.setId(aiv.getId());
+                orderAccompanyDTO.setName(aiv.getName());
+                orderAccompanyDTO.setUnit(aiv.getUnit());
+                orderAccompanyDTO.setUnitPrice(aiv.getPrice());
+                orderAccompanyDTO.setNum(aiv.getNumber());
+                oads.add(orderAccompanyDTO);
+            }else {
+                OrderAccompanyDTO orderAccompanyDTO = orderAccompanyDTOMap.get(aiv.getId().toString());
+                if(null != orderAccompanyDTO) {
+                    orderAccompanyDTO.setName(aiv.getName());
+                    orderAccompanyDTO.setUnit(aiv.getUnit());
+                    orderAccompanyDTO.setUnitPrice(aiv.getPrice());
+                    oads.add(orderAccompanyDTO);
+                }
+            }
+        }
+        bo.setAccompanyItems(oads);
+//        for(OrderAccompanyDTO oad : bo.getAccompanyItems()) {
+//            AccompanyingItemVo aiv = accompanyingItemMap.get(oad.getId().toString());
+//            oad.setName(aiv.getName());
+//            oad.setUnit(aiv.getUnit());
+//            oad.setUnitPrice(aiv.getPrice());
+//            oad.setNum(aiv.getNumber());
+//            oad.setTotalAmount(oad.getUnitPrice().multiply(new BigDecimal(oad.getNum().toString())));
+//        }
 
         //获取可用车辆
         acquireVehicle(bo);