云上接口改造

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

@@ -137,8 +137,8 @@ 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);
+        String travelNo = model.getSubjectCode();
+        model.setSubjectCode(null);
         List<org.dromara.common.ys.model.res.airport.BookOrderModel> orderList = airPortService.bookOrder(getUserId(), model);
         //添加到订单表
         orderAirportService.batchSaveOrder(getUserId(), travelNo, StreamUtils.toList(orderList, org.dromara.common.ys.model.res.airport.BookOrderModel::getOrderNo));

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/hotel/HotelController.java

@@ -68,8 +68,10 @@ public class HotelController extends BaseController {
     @GlobalTransactional(rollbackFor = Exception.class)
     @PostMapping("/order/book")
     public R<HotelOrderBookModel> orderBook(@RequestBody org.dromara.common.ys.model.req.hotel.HotelOrderBookModel model) {
+        String subjectCode = model.getSubjectCode();
+        model.setSubjectCode(null);
         HotelOrderBookModel book = hotelService.orderBook(getUserId(), model);
-        orderHotelService.batchSaveOrder(getUserId(), List.of(book.getOrderId()));
+        orderHotelService.batchSaveOrder(getUserId(), subjectCode, List.of(book.getOrderId()));
         return R.ok(book);
     }
 

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/train/TrainController.java

@@ -209,8 +209,10 @@ public class TrainController extends BaseController {
     @GlobalTransactional(rollbackFor = Exception.class)
     @PostMapping("bookOrder")
     public R<OrderBookResModel> bookOrder(@RequestBody OrderBookReqModel model) {
+        String subjectCode = model.getSubjectCode();
+        model.setSubjectCode(null);
         OrderBookResModel res = trainService.bookOrder(getUserId(), model);
-        orderTrainService.batchSaveOrder(getUserId(), List.of(res.getOrderId()));
+        orderTrainService.batchSaveOrder(getUserId(),subjectCode, List.of(res.getOrderId()));
         return R.ok(res);
     }
 

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/vehicle/VehiclesController.java

@@ -83,8 +83,10 @@ public class VehiclesController extends BaseController {
     @PostMapping("/order/bookJsyc")
     public R<OrderBookJsycModel> bookOrderJsyc(@RequestBody org.dromara.common.ys.model.req.vehicles.OrderBookJsycModel model) {
         model.setTripType(Integer.parseInt(TripType.PUBLIC.getCode()));
+        String subjectCode = model.getSubjectCode();
+        model.setSubjectCode(null);
         OrderBookJsycModel order = vehiclesService.bookJsyc(getUserId(), model);
-        orderVehiclesService.saveOrder(getUserId(), order.getOrderId(), order.getOrderNo());
+        orderVehiclesService.saveOrder(getUserId(), subjectCode, order.getOrderId(), order.getOrderNo());
         return R.ok(order);
     }
 
@@ -95,8 +97,10 @@ public class VehiclesController extends BaseController {
     @PostMapping("/order/bookYyyc")
     public R<OrderBookYyycModel> bookOrderYyyc(@RequestBody org.dromara.common.ys.model.req.vehicles.OrderBookYyycModel model) {
         model.setTripType(Integer.parseInt(TripType.PUBLIC.getCode()));
+        String subjectCode = model.getSubjectCode();
+        model.setSubjectCode(null);
         OrderBookYyycModel order = vehiclesService.bookYyyc(getUserId(), model);
-        orderVehiclesService.saveOrder(getUserId(), order.getOrderId(), order.getOrderNo());
+        orderVehiclesService.saveOrder(getUserId(), subjectCode, order.getOrderId(), order.getOrderNo());
         return R.ok(order);
     }
 

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

@@ -19,9 +19,10 @@ public interface IOrderHotelService extends IBaseService<OrderHotelVo, OrderHote
      * 批量保存订单
      *
      * @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/IOrderTrainService.java

@@ -19,9 +19,10 @@ public interface IOrderTrainService extends IBaseService<OrderTrainVo, OrderTrai
      * 批量保存订单
      *
      * @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/IOrderVehiclesService.java

@@ -18,11 +18,12 @@ public interface IOrderVehiclesService extends IBaseService<OrderVehiclesVo, Ord
     /**
      * 批量保存订单
      *
-     * @param userId  用户id
-     * @param orderId 订单id
-     * @param orderNo 订单编码
+     * @param userId    用户id
+     * @param applyCode 申请单编码
+     * @param orderId   订单id
+     * @param orderNo   订单编码
      */
-    void saveOrder(String userId, String orderId, String orderNo);
+    void saveOrder(String userId, String applyCode, String orderId, String orderNo);
 
     /**
      * 更新火车票信息

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

@@ -87,13 +87,14 @@ public class OrderHotelServiceImpl extends AbstractBaseService<OrderHotelVo, Ord
     }
 
     @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<OrderHotel> orderList = orderNoList.stream().map(orderNo -> {
             OrderHotel order = new OrderHotel();
+            order.setApplyCode(applyCode);
             order.setPersonCode(userId);
             order.setOrderNo(orderNo);
             order.setTenantId(user.getTenantId());
@@ -124,7 +125,7 @@ public class OrderHotelServiceImpl extends AbstractBaseService<OrderHotelVo, Ord
             scheduledExecutorService.execute(() -> {
                 HotelOrderQueryDetailModel orderModel = hotelService.hotelOrderDetail(order.getPersonCode(), new org.dromara.common.ys.model.req.hotel.HotelOrderQueryDetailModel().setOrderNo(order.getOrderNo()));
                 //跟新订单数据
-                BeanUtil.copyProperties(orderModel, order, "id", "personCode", "tenantId");
+                BeanUtil.copyProperties(orderModel, order, "id", "personCode", "tenantId", "applyCode");
                 baseMapper.updateById(order);
                 //跟新入住人信息集合
                 List<HotelOrderPsgInfoBean> psgList = orderModel.getHtOrderPsgList();

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

@@ -105,13 +105,14 @@ public class OrderTrainServiceImpl extends AbstractBaseService<OrderTrainVo, Ord
     }
 
     @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<OrderTrain> orderList = orderNoList.stream().map(orderNo -> {
             OrderTrain order = new OrderTrain();
+            order.setApplyCode(applyCode);
             order.setPersonCode(userId);
             order.setOrderNo(orderNo);
             order.setTenantId(user.getTenantId());
@@ -143,7 +144,7 @@ public class OrderTrainServiceImpl extends AbstractBaseService<OrderTrainVo, Ord
             scheduledExecutorService.execute(() -> {
                 OrderInfoModel orderModel = trainService.detail(order.getPersonCode(), new OrderQueryModel().setOrderNO(order.getOrderNo()));
                 //跟新订单数据
-                BeanUtil.copyProperties(orderModel, order, "id", "personCode", "tenantId");
+                BeanUtil.copyProperties(orderModel, order, "id", "personCode", "tenantId", "applyCode");
                 order.setOrderStatusName(orderModel.getOrderStatuName());
                 order.setIsByIdCard(orderModel.getIsByidcard());
                 order.setIsNoSeat(orderModel.getIsNoseat());

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

@@ -148,12 +148,13 @@ public class OrderVehiclesServiceImpl extends AbstractBaseService<OrderVehiclesV
     }
 
     @Override
-    public void saveOrder(String userId, String orderId, String orderNo) {
+    public void saveOrder(String userId, String applyCode, String orderId, String orderNo) {
         BizUser user = userMapper.selectOne(new LambdaQueryWrapper<BizUser>().eq(BizUser::getUserNo, userId));
         if (Objects.isNull(user)) {
             throw new RuntimeException("用户不存在");
         }
         OrderVehicles order = new OrderVehicles();
+        order.setApplyCode(applyCode);
         order.setPersonCode(userId);
         order.setOrderNo(orderNo);
         order.setOrderId(orderId);
@@ -179,7 +180,7 @@ public class OrderVehiclesServiceImpl extends AbstractBaseService<OrderVehiclesV
             scheduledExecutorService.execute(() -> {
                 OrderDetailModel orderModel = vehiclesService.detail(order.getPersonCode(), new org.dromara.common.ys.model.req.vehicles.OrderDetailModel().setOrderNo(order.getOrderNo()));
                 //跟新订单数据
-                BeanUtil.copyProperties(orderModel, order, "id", "personCode", "tenantId", "orderNo");
+                BeanUtil.copyProperties(orderModel, order, "id", "personCode", "tenantId", "orderNo", "applyCode");
                 order.setIsCancel(orderModel.getIscancel());
                 order.setDdCityId(orderModel.getDdcityId());
                 order.setDdCityName(orderModel.getDdcityName());