Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

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

@@ -260,10 +260,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
             //提前的天数, 当天就算使用一天
             int noUsedDay = getDaysBetweenDateTime(nowTime, endTime) - 1;
             //退还未使用的天数，或者金额，扣除违约金，实际未使用天数的金额，最多3000元
-            InProgressVO inProgressVO = new InProgressVO();
-            inProgressVO.setViolateAmount(new BigDecimal(200));
-            inProgressVO.setExtraAmount(new BigDecimal(200));
-            //InProgressVO inProgressVO = orderCalculateBiz.inProgressCalculate(orderPageVO, actualDay - noUsedDay);
+//            InProgressVO inProgressVO = new InProgressVO();
+//            inProgressVO.setViolateAmount(new BigDecimal(200));
+//            inProgressVO.setExtraAmount(new BigDecimal(200));
+            InProgressVO inProgressVO = orderCalculateBiz.inProgressCalculate(orderPageVO, actualDay - noUsedDay);
             if (inProgressVO != null) {
                 //消费超额金
                 if(inProgressVO.getExtraAmount() != null) {