Merge remote-tracking branch 'origin/dev' into dev

8f0b7221 · libin · a9a04217 · f799ea1e · 8f0b7221
Commit 8f0b7221 authored Sep 20, 2019 by libin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

OrderCancelBiz.java ...ava/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java +1 -1

No files found.
--- a/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
+++ b/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
@@ -293,7 +293,7 @@ public class OrderCancelBiz {

                //取消租车预定 和 记录生成额外的费用明细
                //已支付,并且是待出行状态，取消预约
-                if(OrderStatusEnum.ORDER_TOSTART.getCode().equals(baseOrder.getStatus()) && SYS_TRUE.equals(baseOrder.getHasPay())){
+                if(OrderStatusEnum.ORDER_CANCEL.getCode().equals(baseOrder.getStatus()) && SYS_TRUE.equals(baseOrder.getHasPay())){
                    vehicleFeign.rentUnbookVehicle(orvd.getBookRecordId());

                }else {