Merge remote-tracking branch 'origin/feature-24hour' into feature-24hour

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

@@ -109,12 +109,25 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
 
                     String key = RENT_REFUND;
 
+                    //违约金封顶 租车身份价 * 2天
+                    BigDecimal topAmount = vehicleItem.getUnitPrice().multiply(new BigDecimal(2+ ""));
+
                     BigDecimal deductionAmount = orderAccountBiz.calculateDeduction(vehicleItem.getBuyAmount()
                             , orderPageVO.getOrderRentVehicleDetail().getStartTime() - System.currentTimeMillis()
                             , DictionaryKey.APP_ORDER+ "_"+ key
                             , refundDescBuilder);
 
-                    totalDeductAmount = deductionAmount;
+                    deductionAmount = deductionAmount.setScale(2, RoundingMode.HALF_UP);
+                    if(topAmount.compareTo(deductionAmount) > 0) {
+                        totalDeductAmount = totalDeductAmount.add(deductionAmount);
+                        topAmount = topAmount.subtract(deductionAmount);
+                    }else {
+                        totalDeductAmount = totalDeductAmount.add(topAmount);
+                        deductionAmount = topAmount;
+                        topAmount = BigDecimal.ZERO;
+                    }
+
+//                    totalDeductAmount = deductionAmount;
                     totalRefundAmount = orderPageVO.getRealAmount().subtract(deductionAmount);
                     refundDesc = refundDescBuilder.toString();
                 }