Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourSpePriceVo.java

@@ -26,8 +26,12 @@ public class TourSpePriceVo {
 	@ApiModelProperty(value = "等级")
     private Integer level;
 
-	//大人单价"
-	@ApiModelProperty(value = "大人单价")
+	//大人原单价"
+	@ApiModelProperty(value = "大人原单价")
+	private BigDecimal OriginalPrice;
+
+	//大人优惠单价"
+	@ApiModelProperty(value = "大人优惠单价")
 	private BigDecimal price;
 
 	//大人总价
@@ -40,7 +44,11 @@ public class TourSpePriceVo {
 
 	//儿童单价
 	@ApiModelProperty(value = "儿童单价")
-    private BigDecimal childPrice;
+    private BigDecimal childOriginalPrice;
+
+	//儿童优惠单价
+	@ApiModelProperty(value = "儿童优惠单价")
+	private BigDecimal childPrice;
 
 	//儿童总价
 	@ApiModelProperty(value = "儿童总价")

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

@@ -45,6 +45,12 @@ public class TourGoodSpeBiz extends BaseBiz<TourGoodSpePriceMapper, TourGoodSpeP
                 priceVo.setStock(spePrice.getStock());
                 BigDecimal price = spePrice.getPrice();
                 BigDecimal childPrice = spePrice.getChildPrice();
+                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");
+                priceVo.setTotalPrice(totalPrice);
+                priceVo.setTotalChildPrice(totalChildPrice);
                 if (level != null && level > 0) {
                     String memberPrice = spePrice.getMemberPrice();
                     JSONArray array = JSONArray.parseArray(memberPrice);
@@ -62,12 +68,12 @@ public class TourGoodSpeBiz extends BaseBiz<TourGoodSpePriceMapper, TourGoodSpeP
                         }
                     }
                 }
-                    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");
+                    totalPrice = price.multiply(new BigDecimal(number)).setScale(2, RoundingMode.HALF_UP);
+                    totalChildPrice = childNumber > 0 ? price.multiply(new BigDecimal(childNumber)).setScale(2, RoundingMode.HALF_UP): new BigDecimal("0.00");
                     priceVo.setPrice(price);
                     priceVo.setChildPrice(childPrice);
-                    priceVo.setTotalPrice(totalPrice);
-                    priceVo.setTotalChildPrice(totalChildPrice);
+                    priceVo.setRealPrice(totalPrice);
+                    priceVo.setRealChildPrice(totalChildPrice);
                     return ObjectRestResponse.succ(priceVo);
                 }
             }