修改

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

@@ -402,7 +402,7 @@ public class OrderCancelBiz {
                     orderRentVehicleBiz.updateSelectiveById(orvd);
                 }
 
-                if(BaseOrder.ORDER_SIGN_APPLY == baseOrder.getOrderOrigin()) {
+                if(BaseOrder.ORDER_SIGN_APPLY == baseOrder.getOrderSign()) {
                     //更新 申请状态
                     ShuntApply shuntApply = shuntApplyBiz.selectOne(new ShuntApply(){{
                         setOrderNo(baseOrder.getNo());
@@ -422,7 +422,7 @@ public class OrderCancelBiz {
                     }
                 }
 
-                if(BaseOrder.ORDER_SIGN_SPECIAL == baseOrder.getOrderOrigin()) {
+                if(BaseOrder.ORDER_SIGN_SPECIAL == baseOrder.getOrderSign()) {
                     //更新 申请状态
                     SpecialRent specialRent = specialRentBiz.selectOne(new SpecialRent(){{
                         setOrderNo(baseOrder.getNo());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/ShuntApplyController.java

@@ -223,6 +223,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
         dto.setEndCompanyId(shuntApply.getEndCompanyId());
         RentVehicleBO bo = orderRentVehicleBiz.initRentVehicleBO(dto);
         bo.setOrderSign(BaseOrder.ORDER_SIGN_APPLY);
+        bo.setBookRecordId(shuntApply.getBookRecordId());
         bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
         orderRentVehicleService.applyCreateOrder(bo, shuntApply.getOrderNo());
         baseBiz.updateSelectiveById(new ShuntApply(){{