Merge remote-tracking branch 'origin/holiday-price' into holiday-price

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) {