代码优化

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.tenant.helper.TenantHelper;
 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;
@@ -146,26 +147,16 @@ public class OrderAirportServiceImpl extends AbstractBaseService<OrderAirportVo,
         for (OrderAirport bo : orderList) {
             baseMapper.insert(bo);
         }
-        updateOrderInfo(orderNoList);
-        //新增订票策略
-        List<OrderAirport> OrderAirportList = baseMapper.selectList(OrderAirport::getOrderNo, orderNoList);
-        OrderAirportList.forEach(order -> {
-            OrderInvoicingBo invoice = new OrderInvoicingBo()
-                .setOrderId(order.getId())
-                .setType(OrderType.AIRPORT.getType())
-                .setPersonCode(order.getPersonCode())
-                .setOrderNo(order.getOrderNo())
-                .setUseName(Optional.ofNullable(order).map(OrderAirport::getPsg).orElse(null))
-                .setUseTime(Optional.ofNullable(rangeMapper.selectOne(OrderAirportRange::getOrderNo, order.getOrderNo()))
-                    .map(o -> DateUtil.parse(o.getDepartTime(), "yyyy-MM-dd HH:mm"))
-                    .orElse(null));
-            orderInvoicingService.save(invoice);
-        });
+        updateOrderInfo(orderNoList, true);
     }
 
-
     @Override
     public void updateOrderInfo(List<String> orderNoList) {
+        updateOrderInfo(orderNoList, false);
+    }
+
+
+    private void updateOrderInfo(List<String> orderNoList, Boolean isAdd) {
         if (CollectionUtils.isEmpty(orderNoList)) {
             return;
         }
@@ -298,6 +289,24 @@ public class OrderAirportServiceImpl extends AbstractBaseService<OrderAirportVo,
                         ticketMapper.updateById(orderTicket);
                     }
                 }
+                if (isAdd) {
+                    TenantHelper.dynamic(order.getTenantId(), () -> {
+                        //新增订票策略
+                        List<OrderAirport> OrderAirportList = baseMapper.selectList(OrderAirport::getOrderNo, orderNoList);
+                        OrderAirportList.forEach(or -> {
+                            OrderInvoicingBo invoice = new OrderInvoicingBo()
+                                .setOrderId(or.getId())
+                                .setType(OrderType.AIRPORT.getType())
+                                .setPersonCode(or.getPersonCode())
+                                .setOrderNo(or.getOrderNo())
+                                .setUseName(Optional.ofNullable(or).map(OrderAirport::getPsg).orElse(null))
+                                .setUseTime(Optional.ofNullable(rangeMapper.selectOne(OrderAirportRange::getOrderNo, or.getOrderNo()))
+                                    .map(o -> DateUtil.parse(o.getDepartTime(), "yyyy-MM-dd HH:mm"))
+                                    .orElse(null));
+                            orderInvoicingService.save(invoice);
+                        });
+                    });
+                }
             });
         });
     }

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

@@ -50,7 +50,6 @@ public class OrderInvoicingServiceImpl extends AbstractBaseService<OrderInvoicin
             }
             insertByBo(bo);
         }else {
-            invoicing.setPersonCode(bo.getPersonCode());
             invoicing.setUseName(bo.getUseName());
             invoicing.setAuthName(bo.getAuthName());
             invoicing.setUseTime(bo.getUseTime());