代码优化

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

@@ -10,6 +10,7 @@ import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.common.mybatis.service.AbstractBaseService;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.common.ys.model.res.airport.QueryTkOrderModel;
 import org.dromara.common.ys.model.res.airport.other.*;
@@ -171,6 +172,7 @@ public class OrderAirportServiceImpl extends AbstractBaseService<OrderAirportVo,
         List<OrderAirportBusiness> orderBusinessList = businessMapper.selectList(new LambdaQueryWrapper<OrderAirportBusiness>().in(OrderAirportBusiness::getOrderId, orderIds));
         List<OrderAirportPay> orderPayList = payMapper.selectList(new LambdaQueryWrapper<OrderAirportPay>().in(OrderAirportPay::getOrderId, orderIds));
         List<OrderAirportTicket> orderTicketList = ticketMapper.selectList(new LambdaQueryWrapper<OrderAirportTicket>().in(OrderAirportTicket::getOrderId, orderIds));
+        Long projectId = isAdd ? LoginHelper.getProjectId() : null;
         //更新数据
         orderList.forEach(order -> {
             scheduledExecutorService.execute(() -> {
@@ -297,6 +299,7 @@ public class OrderAirportServiceImpl extends AbstractBaseService<OrderAirportVo,
                             .setType(OrderType.AIRPORT.getType())
                             .setPersonCode(order.getPersonCode())
                             .setOrderNo(order.getOrderNo())
+                            .setProjectId(projectId)
                             .setUseName(Optional.ofNullable(order).map(OrderAirport::getPsg).orElse(null))
                             .setUserId(order.getCreateBy())
                             .setUseTime(

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

@@ -10,6 +10,7 @@ import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.common.mybatis.service.AbstractBaseService;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.common.ys.model.res.airport.other.OrderBusinessInfoBean;
 import org.dromara.common.ys.model.res.airport.other.OrderPayInfoBean;
@@ -169,6 +170,7 @@ public class OrderHotelServiceImpl extends AbstractBaseService<OrderHotelVo, Ord
         List<OrderHotelPriceInfo> orderPriceList = priceInfoMapper.selectList(new LambdaQueryWrapper<OrderHotelPriceInfo>().in(OrderHotelPriceInfo::getOrderId, orderIds));
         List<OrderHotelPsgInfo> orderPsgList = psgInfoMapper.selectList(new LambdaQueryWrapper<OrderHotelPsgInfo>().in(OrderHotelPsgInfo::getOrderId, orderIds));
         List<OrderHotelPayInfo> orderPayInfoList = payInfoMapper.selectList(new LambdaQueryWrapper<OrderHotelPayInfo>().in(OrderHotelPayInfo::getOrderId, orderIds));
+        Long projectId = isAdd ? LoginHelper.getProjectId() : null;
         //更新数据
         orderList.forEach(order -> {
             scheduledExecutorService.execute(() -> {
@@ -267,6 +269,7 @@ public class OrderHotelServiceImpl extends AbstractBaseService<OrderHotelVo, Ord
                             .setType(OrderType.HOTEL.getType())
                             .setPersonCode(order.getPersonCode())
                             .setOrderNo(order.getOrderNo())
+                            .setProjectId(projectId)
                             .setUserId(order.getCreateBy())
                             .setUseName(Optional.ofNullable(order).map(OrderHotel::getPsgName).orElse(null))
                             .setUseTime(Optional.ofNullable(order)

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.dromara.common.core.enums.UserType;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.common.mybatis.service.AbstractBaseService;
@@ -57,10 +56,7 @@ public class OrderInvoicingServiceImpl extends AbstractBaseService<OrderInvoicin
             //设置用户信息
             RemoteUserVo user = remoteUserService.selectById(bo.getUserId());
             bo.setUserType(user.getUserType())
-                .setProjectId(
-                    StringUtils.contains(user.getUserType(), UserType.PROJECT_USER.getUserType()) ?
-                        Long.parseLong(user.getUserType().split(":")[1]) : null
-                );
+                .setProjectId(bo.getProjectId());
             bo.setCreateName(user.getNickName());
             bo.setCreateBy(bo.getUserId());
             bo.setCreateDept(user.getDeptId());

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

@@ -10,6 +10,7 @@ import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.common.mybatis.service.AbstractBaseService;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.common.ys.model.req.train.OrderQueryModel;
 import org.dromara.common.ys.model.res.airport.other.OrderPayInfoBean;
@@ -179,6 +180,7 @@ public class OrderTrainServiceImpl extends AbstractBaseService<OrderTrainVo, Ord
         List<OrderTrainPayInfo> orderPayInfoList = payInfoMapper.selectList(new LambdaQueryWrapper<OrderTrainPayInfo>().in(OrderTrainPayInfo::getOrderId, orderIds));
         List<OrderTrainRange> orderRangeList = rangeMapper.selectList(new LambdaQueryWrapper<OrderTrainRange>().in(OrderTrainRange::getOrderId, orderIds));
         List<OrderTrainTicket> orderTicketList = ticketMapper.selectList(new LambdaQueryWrapper<OrderTrainTicket>().in(OrderTrainTicket::getOrderId, orderIds));
+        Long projectId = isAdd ? LoginHelper.getProjectId() : null;
         //更新数据
         orderList.forEach(order -> {
             scheduledExecutorService.execute(() -> {
@@ -305,6 +307,7 @@ public class OrderTrainServiceImpl extends AbstractBaseService<OrderTrainVo, Ord
                             .setType(OrderType.TRAIN.getType())
                             .setPersonCode(order.getPersonCode())
                             .setOrderNo(order.getOrderNo())
+                            .setProjectId(projectId)
                             .setUserId(order.getCreateBy())
                             .setUseName(Optional.ofNullable(order).map(OrderTrain::getPassengerNames).orElse(null))
                             .setUseTime(Optional.ofNullable(rangeMapper.selectOne(OrderTrainRange::getOrderNo, order.getOrderNo()))

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

@@ -10,6 +10,7 @@ import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.common.mybatis.service.AbstractBaseService;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.common.ys.model.res.airport.other.OrderBusinessInfoBean;
 import org.dromara.common.ys.model.res.airport.other.OrderPayInfoBean;
@@ -213,6 +214,7 @@ public class OrderVehiclesServiceImpl extends AbstractBaseService<OrderVehiclesV
         }
         List<OrderVehiclesBusiness> orderBusinessList = businessMapper.selectList(new LambdaQueryWrapper<OrderVehiclesBusiness>().in(OrderVehiclesBusiness::getOrderId, orderIds));
         List<OrderVehiclesPayInfo> orderPayInfoList = payInfoMapper.selectList(new LambdaQueryWrapper<OrderVehiclesPayInfo>().in(OrderVehiclesPayInfo::getOrderId, orderIds));
+        Long projectId = isAdd ? LoginHelper.getProjectId() : null;
         //更新数据
         orderList.forEach(order -> {
             scheduledExecutorService.execute(() -> {
@@ -271,6 +273,7 @@ public class OrderVehiclesServiceImpl extends AbstractBaseService<OrderVehiclesV
                             .setPersonCode(order.getPersonCode())
                             .setOrderNo(order.getOrderNo())
                             .setUserId(order.getCreateBy())
+                            .setProjectId(projectId)
                             .setUseName(Optional.ofNullable(orderVehicles).map(OrderVehicles::getPhoneNumber).orElse(null))
                             .setUseTime(Optional.ofNullable(orderVehicles).map(ov -> {
                                 if (StringUtils.isNotEmpty(ov.getStartTime())) {