Merge branch 'dev'

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/dubbo/RemoteYsOrderServiceImpl.java

@@ -189,41 +189,45 @@ public class RemoteYsOrderServiceImpl implements RemoteYsOrderService {
     @Override
     public void payed(String orderType, String orderNo) {
         log.info("支付成功后确认出票,orderType:{},orderNo:{}", orderType, orderNo);
-        pay(orderType, orderNo);
+        pay(orderType, orderNo, true);
     }
 
-    private void pay(String orderType, String orderNo) {
+    private void pay(String orderType, String orderNo, Boolean isPerson) {
         if (StringUtils.equals(orderType, OrderType.AIRPORT.getType())) {
             //飞机票
             Optional.ofNullable(orderAirportService.getOne(new OrderAirportBo().setOrderNo(orderNo))).ifPresent(vo -> {
+                try {
+                    //飞机票支付
+                    airportService.payOrder(vo.getPersonCode(), new OrderPayModel().setOrderNo(orderNo));
+                } catch (Exception e) {
+                    log.error("飞机票支付失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
+                }
+                if (isPerson) {
                     try {
                         //确认出票
                         airportService.confirmOrder(vo.getPersonCode(), new OrderConfirmModel().setOrderNo(orderNo).setAutoDraw(1));
                     } catch (Exception e) {
                         log.error("飞机票确认出票失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
                     }
-                try {
-                    //飞机票支付
-                    airportService.payOrder(vo.getPersonCode(), new OrderPayModel().setOrderNo(orderNo));
-                } catch (Exception e) {
-                    log.error("飞机票支付失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
                 }
                 orderAirportService.updateOrderInfo(List.of(orderNo));
             });
         } else if (StringUtils.equals(orderType, OrderType.TRAIN.getType())) {
             //火车票
             Optional.ofNullable(orderTrainService.getOne(new OrderTrainBo().setOrderNo(orderNo))).ifPresent(vo -> {
+                try {
+                    //火车票支付
+                    trainService.payOrder(vo.getPersonCode(), new org.dromara.common.ys.model.req.train.PayOrderModel().setOrderNo(orderNo));
+                } catch (Exception e) {
+                    log.error("火车票支付失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
+                }
+                if (isPerson) {
                     try {
                         //确认出票
                         trainService.confirmOrder(vo.getPersonCode(), new ConfirmOrderModel().setOrderNo(orderNo));
                     } catch (Exception e) {
                         log.error("火车票确认出票失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
                     }
-                try {
-                    //火车票支付
-                    trainService.payOrder(vo.getPersonCode(), new org.dromara.common.ys.model.req.train.PayOrderModel().setOrderNo(orderNo));
-                } catch (Exception e) {
-                    log.error("火车票支付失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
                 }
                 orderTrainService.updateOrderInfo(List.of(orderNo));
             });
@@ -232,12 +236,14 @@ public class RemoteYsOrderServiceImpl implements RemoteYsOrderService {
         } else if (StringUtils.equals(orderType, OrderType.HOTEL.getType())) {
             //酒店
             Optional.ofNullable(orderHotelService.getOne(new OrderHotelBo().setOrderNo(orderNo))).ifPresent(vo -> {
+                if (isPerson) {
                     try {
                         //确认出票
                         hotelService.orderPay(vo.getPersonCode(), new PayOrderModel().setOrderNo(orderNo));
                     } catch (Exception e) {
                         log.error("酒店确认出票失败,orderNo:{},失败原因：{}", orderNo, e.getMessage());
                     }
+                }
                 orderHotelService.updateOrderInfo(List.of(orderNo));
             });
         }
@@ -246,7 +252,7 @@ public class RemoteYsOrderServiceImpl implements RemoteYsOrderService {
     @Override
     public void orderApprove(RemoteOrderApprove orderApprove) {
         log.info("审批同意后，订单修改：{}", orderApprove);
-        pay(orderApprove.getOrderType(), orderApprove.getOrderNo());
+        pay(orderApprove.getOrderType(), orderApprove.getOrderNo(), false);
         orderInvoicingService.save(
             new OrderInvoicingBo()
                 .setType(orderApprove.getOrderType())