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

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

@@ -61,8 +61,7 @@ import java.util.TimeZone;
 import java.util.stream.Collectors;
 
 import static com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant.*;
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.*;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 /**
@@ -233,6 +232,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         return a;
     }
 
+
     public void updateCrossRefund(OrderPageVO orderPageVO) {
         //计算延期费用
         DedDetailDTO dedDetailDTO = new DedDetailDTO();
@@ -267,7 +267,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         if (orderPageVO.getOrderRentVehicleDetail().getEndTime() > nowTime.getMillis()) {
             StringBuilder stringBuilder = new StringBuilder();
             //提前的天数, 当天就算使用一天
-            int noUsedDay = getDaysBetweenDateTime(nowTime, endTime) - 1;
+            int noUsedDay = getDaysBetweenDateTimeHasStartEnd(nowTime, endTime) - 1;
             //退还未使用的天数，或者金额，扣除违约金，实际未使用天数的金额，最多3000元
 //            InProgressVO inProgressVO = new InProgressVO();
 //            inProgressVO.setViolateAmount(new BigDecimal(200));
@@ -294,17 +294,19 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
             StringBuilder stringBuilder = new StringBuilder();
             stringBuilder.append("违约金( ¥");
             //延期的天数, 延期违约金是延期天数*200%
-            int usedDay = getDaysBetweenDateTime(endTime, nowTime);
-            stringBuilder.append(amount);
-            stringBuilder.append(" x ");
-            stringBuilder.append(usedDay);
-            stringBuilder.append("(天)");
-            stringBuilder.append(" x 2");
-            BigDecimal cost = amount.multiply(new BigDecimal(usedDay)).multiply(new BigDecimal(2));
-            stringBuilder.append(" = ");
-            stringBuilder.append(cost);
-            stringBuilder.append("元");
-            initDedDetail(dedDetailDTO, OrderViolateEnum.AFTER.getCode(), cost, stringBuilder);
+            int extraUsedDay = getDaysBetweenDateTimeHasStartEnd(endTime, nowTime) - 1;
+            if(extraUsedDay > 0) {
+                stringBuilder.append(amount);
+                stringBuilder.append(" x ");
+                stringBuilder.append(extraUsedDay);
+                stringBuilder.append("(天)");
+                stringBuilder.append(" x 2");
+                BigDecimal cost = amount.multiply(new BigDecimal(extraUsedDay+ "")).multiply(new BigDecimal(2+ ""));
+                stringBuilder.append(" = ");
+                stringBuilder.append(cost);
+                stringBuilder.append("元");
+                initDedDetail(dedDetailDTO, OrderViolateEnum.AFTER.getCode(), cost, stringBuilder);
+            }
         }
         orderPageVO.setDedDetailDTO(JSONObject.toJSONString(dedDetailDTO));
     }