Merge branch 'feature_chw_zjw2' into dev-chw

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java

@@ -434,6 +434,12 @@ public class OrderCancelBiz {
                     }});
 
                     if(null != specialRent ) {
+                        //特惠租车 恢复排班记录
+                        VehicleVO vehicle = vehicleFeign.getVehicleDetail(specialRent.getVehicleId()).getData();
+                        Long delayTime = specialRentBiz.handleRent(specialRent, vehicle);
+                        specialRent.setUpdTime(null);
+                        specialRentBiz.updateSelectiveById(specialRent);
+
                         Integer status = SpecialRent.STATUS_AUTOCNL_TOPAY;
                         if(SYS_TRUE.equals(baseOrder.getHasPay())) {
                             //
@@ -445,14 +451,10 @@ public class OrderCancelBiz {
                             setStatus(finalStatus);
                             setOrderStatus(SpecialRent.ORDER_STATUS_CANCEL);
                         }});
+
+                        rabbitProduct.sendSpecialDelayMessage(specialRentBiz.selectById(specialRent.getId()), delayTime);
                     }
 
-                    //特惠租车 恢复排班记录
-                    VehicleVO vehicle = vehicleFeign.getVehicleDetail(specialRent.getVehicleId()).getData();
-                    Long delayTime = specialRentBiz.handleRent(specialRent, vehicle);
-                    specialRent.setUpdTime(null);
-                    specialRentBiz.updateSelectiveById(specialRent);
-                    rabbitProduct.sendSpecialDelayMessage(specialRentBiz.selectById(specialRent.getId()), delayTime);
                 }
 
             }else if(OrderTypeEnum.TOUR.getCode().equals(baseOrder.getType())) {