|
|
@@ -104,6 +104,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
|
|
|
|
|
|
private final IOrderEstimateService orderEstimateService;
|
|
|
|
|
|
+ private final ILandVehicleClient landVehicleClient;
|
|
|
+
|
|
|
|
|
|
@Override
|
|
|
public IPage<OrderVO> selectOrderPage(IPage<OrderVO> page, OrderVO order) {
|
|
|
@@ -692,6 +694,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
|
|
|
.eq(OrderItem::getShippingMode, "散货");
|
|
|
OrderItem orderItem = orderItemMapper.selectOne(queryWrapper);
|
|
|
OrderItem item = new OrderItem();
|
|
|
+ if (StringUtils.isNotBlank(order.getPlateNo())) {
|
|
|
+ LandVehicle vehicle = landVehicleClient.selectByPlateNo(order.getPlateNo());
|
|
|
+ item.setOwned(Objects.nonNull(vehicle) ? vehicle.getOwned() : 0);
|
|
|
+ orderItem.setOwned(Objects.nonNull(vehicle) ? vehicle.getOwned() : 0);
|
|
|
+ }
|
|
|
if (ObjectUtil.isEmpty(orderItem)) {
|
|
|
item.setOrderId(order.getId());
|
|
|
item.setShippingMode("散货");
|