飞机票功能改造

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/airport/AirportController.java

@@ -137,9 +137,11 @@ public class AirportController extends BaseController {
     @PostMapping("/bookOrder")
     public R<List<org.dromara.common.ys.model.res.airport.BookOrderModel>> bookOrder(@RequestBody BookOrderModel model) {
         model.setTripType(TripType.PUBLIC.getCode());
+        String travelNo = model.getTravelNo();
+        model.setTravelNo(null);
         List<org.dromara.common.ys.model.res.airport.BookOrderModel> orderList = airPortService.bookOrder(getUserId(), model);
         //添加到订单表
-        orderAirportService.batchSaveOrder(getUserId(), StreamUtils.toList(orderList, org.dromara.common.ys.model.res.airport.BookOrderModel::getOrderNo));
+        orderAirportService.batchSaveOrder(getUserId(), travelNo, StreamUtils.toList(orderList, org.dromara.common.ys.model.res.airport.BookOrderModel::getOrderNo));
         return R.ok(orderList);
     }
 

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/OrderAirport.java

@@ -29,6 +29,11 @@ public class OrderAirport extends TenantEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 唯一标识
+     */
+    private String applyCode;
+
     /**
      * 人员code
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/OrderHotel.java

@@ -30,6 +30,11 @@ public class OrderHotel extends TenantEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 唯一标识
+     */
+    private String applyCode;
+
     /**
      * 人员code
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/OrderTrain.java

@@ -30,6 +30,11 @@ public class OrderTrain extends TenantEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 唯一标识
+     */
+    private String applyCode;
+
     /**
      * 人员code
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/OrderVehicles.java

@@ -31,6 +31,11 @@ public class OrderVehicles extends TenantEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 唯一标识
+     */
+    private String applyCode;
+
     /**
      * 人员code
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/OrderAirportBo.java

@@ -29,6 +29,11 @@ public class OrderAirportBo extends BaseEntity {
     @NotNull(message = "id不能为空", groups = {EditGroup.class})
     private Long id;
 
+    /**
+     * 唯一标识
+     */
+    private String applyCode;
+
     /**
      * 人员code
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/OrderHotelBo.java

@@ -31,6 +31,11 @@ public class OrderHotelBo extends BaseEntity {
     @NotNull(message = "id不能为空", groups = {EditGroup.class})
     private Long id;
 
+    /**
+     * 唯一标识
+     */
+    private String applyCode;
+
     /**
      * 人员code
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/OrderTrainBo.java

@@ -31,6 +31,11 @@ public class OrderTrainBo extends BaseEntity {
     @NotNull(message = "id不能为空", groups = {EditGroup.class})
     private Long id;
 
+    /**
+     * 唯一标识
+     */
+    private String applyCode;
+
     /**
      * 人员code
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/OrderVehiclesBo.java

@@ -29,6 +29,12 @@ public class OrderVehiclesBo extends BaseEntity {
     @NotNull(message = "id不能为空", groups = {EditGroup.class})
     private Long id;
 
+
+    /**
+     * 唯一标识
+     */
+    private String applyCode;
+
     /**
      * 人员code
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderAirportVo.java

@@ -31,6 +31,11 @@ public class OrderAirportVo implements Serializable {
     @ExcelProperty(value = "id")
     private Long id;
 
+    /**
+     * 唯一标识
+     */
+    private String applyCode;
+
     /**
      * 人员code
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderHotelVo.java

@@ -31,6 +31,11 @@ public class OrderHotelVo implements Serializable {
     @ExcelProperty(value = "id")
     private Long id;
 
+    /**
+     * 唯一标识
+     */
+    private String applyCode;
+
     /**
      * 人员code
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderTrainVo.java

@@ -32,6 +32,11 @@ public class OrderTrainVo implements Serializable {
     @ExcelProperty(value = "id")
     private Long id;
 
+    /**
+     * 唯一标识
+     */
+    private String applyCode;
+
     /**
      * 人员code
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderVehiclesVo.java

@@ -30,6 +30,11 @@ public class OrderVehiclesVo implements Serializable {
     @ExcelProperty(value = "id")
     private Long id;
 
+    /**
+     * 唯一标识
+     */
+    private String applyCode;
+
     /**
      * 人员code
      */

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

@@ -18,9 +18,10 @@ public interface IOrderAirportService extends IBaseService<OrderAirportVo, Order
      * 批量保存订单
      *
      * @param userId      用户id
+     * @param applyCode   申请单编码
      * @param orderNoList 订单号列表
      */
-    void batchSaveOrder(String userId, List<String> orderNoList);
+    void batchSaveOrder(String userId, String applyCode, List<String> orderNoList);
 
     /**
      * 更新机票信息

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

@@ -107,13 +107,14 @@ public class OrderAirportServiceImpl extends AbstractBaseService<OrderAirportVo,
     }
 
     @Override
-    public void batchSaveOrder(String userId, List<String> orderNoList) {
+    public void batchSaveOrder(String userId, String applyCode, List<String> orderNoList) {
         BizUser user = userMapper.selectOne(new LambdaQueryWrapper<BizUser>().eq(BizUser::getUserNo, userId));
         if (Objects.isNull(user)) {
             throw new RuntimeException("用户不存在");
         }
         List<OrderAirport> orderList = orderNoList.stream().map(orderNo -> {
             OrderAirport order = new OrderAirport();
+            order.setApplyCode(applyCode);
             order.setPersonCode(userId);
             order.setOrderNo(orderNo);
             order.setTenantId(user.getTenantId());
@@ -147,7 +148,7 @@ public class OrderAirportServiceImpl extends AbstractBaseService<OrderAirportVo,
             scheduledExecutorService.execute(() -> {
                 QueryTkOrderModel orderModel = airportService.detail(order.getPersonCode(), new org.dromara.common.ys.model.req.airport.QueryTkOrderModel().setOrderNo(order.getOrderNo()));
                 //跟新订单数据
-                BeanUtil.copyProperties(orderModel, order, "id", "personCode", "tenantId");
+                BeanUtil.copyProperties(orderModel, order, "id", "personCode", "tenantId", "applyCode");
                 baseMapper.updateById(order);
                 //跟新人员信息
                 List<OrdePsgInfoBean> psgList = orderModel.getOrdePsgList();