Merge branch 'holiday-price' into dev

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

@@ -212,7 +212,7 @@ public class OrderCalculateBiz {
             if(residueDays >= 2) {
                 residueDays = 2;
                 residueAmount = BigDecimal.ZERO;
-                for(int i = useDays; i < (useDays + residueDays + 1); i++) {
+                for(int i = useDays; i < (useDays + residueDays); i++) {
                     residueAmount = residueAmount.add(vmcpds.get(i).getPrice());
                 }
                 violateDesc += StrUtil.format("（封顶{}元）", residueAmount);