Merge branch 'holiday-price' into dev

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

@@ -430,10 +430,14 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             //设置违约金
                 //设置原来算出的违约金及描述
             csv.setViolateAmount(inProgressVO.getViolateAmount());
-            csv.setViolateDesc(inProgressVO.getViolateDesc());
+            csv.setViolateDesc("");
                 //处理更改之后的违约金及描述
             handleCrosstownDetail(crosstown, oad, csv);
 
+            if(StrUtil.isBlank(csv.getViolateDesc())) {
+                csv.setViolateDesc(inProgressVO.getViolateDesc());
+            }
+
             //退款
             BigDecimal refundAmont = oad.getDepositAmount().add(oad.getOrderAmount());
                     //crosstown.getRestDeposit().subtract(illegalReserve);

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodSpeBiz.java

@@ -56,7 +56,7 @@ public class TourGoodSpeBiz extends BaseBiz<TourGoodSpePriceMapper, TourGoodSpeP
                 priceVo.setOriginalPrice(price);
                 priceVo.setChildOriginalPrice(childPrice);
                 BigDecimal totalPrice = price.multiply(new BigDecimal(number)).setScale(2, RoundingMode.HALF_UP);
-                BigDecimal totalChildPrice = childNumber > 0 ? price.multiply(new BigDecimal(childNumber)).setScale(2, RoundingMode.HALF_UP): new BigDecimal("0.00");
+                BigDecimal totalChildPrice = childNumber > 0 ? childPrice.multiply(new BigDecimal(childNumber)).setScale(2, RoundingMode.HALF_UP): new BigDecimal("0.00");
                 priceVo.setTotalPrice(totalPrice);
                 priceVo.setTotalChildPrice(totalChildPrice);
                 if (level != null && level > 0) {