修改违约逻辑

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

@@ -273,7 +273,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         /**
          * 提前还车
          */
-        if (actualDay - userUsedDay < 0) {
+        if (userUsedDay - actualDay < 0) {
             StringBuilder stringBuilder = new StringBuilder();
             //提前的天数, 当天就算使用一天
             int noUsedDay = actualDay - userUsedDay;
@@ -298,11 +298,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
             /**
              * 延期还车
              */
-        } else if (actualDay - userUsedDay > 0) {
+        } else if (userUsedDay - actualDay > 0) {
             StringBuilder stringBuilder = new StringBuilder();
             stringBuilder.append("违约金( ¥");
             //延期的天数, 延期违约金是延期天数*200%
-            int extraUsedDay = orderCalculateBiz.getIncludeDays(endTime, nowTime);
+            int extraUsedDay = userUsedDay - actualDay;
             if(extraUsedDay > 0) {
                 stringBuilder.append(amount);
                 stringBuilder.append(" x ");