代码优化

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderAirportServiceImpl.java

@@ -13,6 +13,7 @@ import org.dromara.common.mybatis.service.AbstractBaseService;
 import org.dromara.common.ys.model.res.airport.QueryTkOrderModel;
 import org.dromara.common.ys.model.res.airport.other.*;
 import org.dromara.common.ys.service.IAirportService;
+import org.dromara.order.api.enums.OrderType;
 import org.dromara.server.domain.*;
 import org.dromara.server.domain.bo.OrderAirportBo;
 import org.dromara.server.domain.bo.OrderInvoicingBo;
@@ -151,7 +152,7 @@ public class OrderAirportServiceImpl extends AbstractBaseService<OrderAirportVo,
         OrderAirportList.forEach(order -> {
             OrderInvoicingBo invoice = new OrderInvoicingBo()
                 .setOrderId(order.getId())
-                .setType(OrderTypeEnum.AIRPORT.getType())
+                .setType(OrderType.AIRPORT.getType())
                 .setPersonCode(order.getPersonCode())
                 .setOrderNo(order.getOrderNo())
                 .setUseName(Optional.ofNullable(order).map(OrderAirport::getPsg).orElse(null))

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderHotelServiceImpl.java

@@ -16,6 +16,7 @@ import org.dromara.common.ys.model.res.hotel.HotelOrderQueryDetailModel;
 import org.dromara.common.ys.model.res.hotel.bean.HotelOrderPriceInfoBean;
 import org.dromara.common.ys.model.res.hotel.bean.HotelOrderPsgInfoBean;
 import org.dromara.common.ys.service.IHotelService;
+import org.dromara.order.api.enums.OrderType;
 import org.dromara.server.domain.*;
 import org.dromara.server.domain.bo.OrderHotelBo;
 import org.dromara.server.domain.bo.OrderInvoicingBo;
@@ -152,7 +153,7 @@ public class OrderHotelServiceImpl extends AbstractBaseService<OrderHotelVo, Ord
         orderHotelList.forEach(order -> {
             OrderInvoicingBo invoice = new OrderInvoicingBo()
                 .setOrderId(order.getId())
-                .setType(OrderTypeEnum.HOTEL.getType())
+                .setType(OrderType.HOTEL.getType())
                 .setPersonCode(order.getPersonCode())
                 .setOrderNo(order.getOrderNo())
                 .setUseName(Optional.ofNullable(order).map(OrderHotel::getPsgName).orElse(null))

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderTrainServiceImpl.java

@@ -18,6 +18,7 @@ import org.dromara.common.ys.model.res.train.bean.PayInfo;
 import org.dromara.common.ys.model.res.train.bean.RangeInfo;
 import org.dromara.common.ys.model.res.train.bean.TicketInfo;
 import org.dromara.common.ys.service.ITrainService;
+import org.dromara.order.api.enums.OrderType;
 import org.dromara.server.domain.*;
 import org.dromara.server.domain.bo.OrderInvoicingBo;
 import org.dromara.server.domain.bo.OrderTrainBo;
@@ -159,7 +160,7 @@ public class OrderTrainServiceImpl extends AbstractBaseService<OrderTrainVo, Ord
         orderTrainList.forEach(order -> {
             OrderInvoicingBo invoice = new OrderInvoicingBo()
                 .setOrderId(order.getId())
-                .setType(OrderTypeEnum.TRAIN.getType())
+                .setType(OrderType.TRAIN.getType())
                 .setPersonCode(order.getPersonCode())
                 .setOrderNo(order.getOrderNo())
                 .setUseName(Optional.ofNullable(order).map(OrderTrain::getPassengerNames).orElse(null))

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderVehiclesServiceImpl.java

@@ -14,6 +14,7 @@ import org.dromara.common.ys.model.res.airport.other.OrderBusinessInfoBean;
 import org.dromara.common.ys.model.res.airport.other.OrderPayInfoBean;
 import org.dromara.common.ys.model.res.vehicles.OrderDetailModel;
 import org.dromara.common.ys.service.IVehiclesService;
+import org.dromara.order.api.enums.OrderType;
 import org.dromara.server.domain.*;
 import org.dromara.server.domain.bo.OrderInvoicingBo;
 import org.dromara.server.domain.bo.OrderVehiclesBo;
@@ -183,7 +184,7 @@ public class OrderVehiclesServiceImpl extends AbstractBaseService<OrderVehiclesV
         OrderVehicles orderVehicles = baseMapper.selectById(order.getId());
         OrderInvoicingBo invoice = new OrderInvoicingBo()
             .setOrderId(order.getId())
-            .setType(OrderTypeEnum.VEHICLES.getType())
+            .setType(OrderType.CAR.getType())
             .setPersonCode(order.getPersonCode())
             .setOrderNo(order.getOrderNo())
             .setUseName(Optional.ofNullable(orderVehicles).map(OrderVehicles::getPhoneNumber).orElse(null))