Merge branch 'holiday-price' into dev

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

@@ -284,7 +284,6 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
                 }
             }
         }
-        //getDaysBetweenDateTimeHasStartEnd(endTime, nowTime) == 1--同一天；>1-- 延后；<1--提前；
         /**
          * 提前还车
          */
@@ -293,19 +292,13 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
             //提前的天数, 当天就算使用一天
             int noUsedDay = actualDay - userUsedDay;
             //退还未使用的天数，或者金额，扣除违约金，实际未使用天数的金额，最多3000元
-//            InProgressVO inProgressVO = new InProgressVO();
-//            inProgressVO.setViolateAmount(new BigDecimal(200));
-//            inProgressVO.setExtraAmount(new BigDecimal(200));
             InProgressVO inProgressVO = orderCalculateBiz.inProgressCalculate(orderPageVO, userUsedDay);
             if (inProgressVO != null) {
                 //消费超额金
                 if(inProgressVO.getExtraAmount() != null) {
                     dedDetailDTO.setExcessCost(inProgressVO.getExtraAmount());
                 }
-//                stringBuilder.append("违约金( ¥");
                 stringBuilder.append("违约金( ");
-//                stringBuilder.append(amount);
-//                stringBuilder.append(" x ");
                 stringBuilder.append(noUsedDay);
                 stringBuilder.append("天) = ");
                 stringBuilder.append(inProgressVO.getViolateAmount());
@@ -316,21 +309,21 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
              */
         } else if (userUsedDay - actualDay > 0) {
             StringBuilder stringBuilder = new StringBuilder();
-//            stringBuilder.append("违约金( ¥");
             stringBuilder.append("违约金( ");
             //延期的天数, 延期违约金是延期天数*200%
+            InProgressVO inProgressVO = orderCalculateBiz.inProgressCalculate(orderPageVO, userUsedDay);
+            if (inProgressVO != null) {
             int extraUsedDay = userUsedDay - actualDay;
             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(inProgressVO.getViolateAmount());
                 stringBuilder.append("元");
-                initDedDetail(dedDetailDTO, OrderViolateEnum.AFTER.getCode(), cost, stringBuilder);
+                initDedDetail(dedDetailDTO, OrderViolateEnum.AFTER.getCode(), inProgressVO.getViolateAmount(), stringBuilder);
+            }
+
             }
         }
         JSONArray jsonArray = new JSONArray();

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

@@ -364,8 +364,8 @@ public class OrderCalculateBiz {
                             , refundDescBuilder);
 
                     topAmount = vehicleItemDTO.getTopAmount(0);
-                    totalDeductAmount = deductionAmount;
-                    totalRefundAmount = orderPageVO.getRealAmount().subtract(deductionAmount);
+                    totalDeductAmount = (topAmount.compareTo(deductionAmount) < 0) ? topAmount: deductionAmount;
+                    totalRefundAmount = orderPageVO.getRealAmount().subtract(totalDeductAmount);
                     refundDesc = refundDescBuilder.toString();
                 }
 

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

@@ -76,7 +76,7 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
         OrderRefundPriceVO orpv = orderCalculateBiz.getPriceCalculate(no, orderPageVO);
         if(orderPageVO.getStatus().equals(OrderStatusEnum.ORDER_UNPAY.getCode())
                 || orderPageVO.getStatus().equals(OrderStatusEnum.ORDER_CRT.getCode())
-                || orpv.getRefundAmount().compareTo(BigDecimal.ZERO) <= 0) {
+                || orpv.getCutAmount().compareTo(BigDecimal.ZERO) <= 0) {
             orpv.setRefundDesc("是否确定取消订单");
         }else {
             orpv.setRefundDesc(StrUtil.format("本次取消操作需要扣除{}元违约金，实际退款金额为{}元，您确定要取消订单吗？", orpv.getCutAmount(), orpv.getRefundAmount()));