diff --git a/src/main/java/com/ycwl/basic/biz/OrderBiz.java b/src/main/java/com/ycwl/basic/biz/OrderBiz.java index 6991a56..7849b9e 100644 --- a/src/main/java/com/ycwl/basic/biz/OrderBiz.java +++ b/src/main/java/com/ycwl/basic/biz/OrderBiz.java @@ -182,7 +182,7 @@ public class OrderBiz { respVO.setFree(priceObj.isFree()); respVO.setGoodsType(goodsType); respVO.setGoodsId(goodsId); - respVO.setPrice(priceObj.getPrice()); + respVO.setOrigPrice(priceObj.getPrice()); respVO.setSlashPrice(priceObj.getSlashPrice()); } return respVO; diff --git a/src/main/java/com/ycwl/basic/biz/PriceBiz.java b/src/main/java/com/ycwl/basic/biz/PriceBiz.java index a233ca1..a6b6d77 100644 --- a/src/main/java/com/ycwl/basic/biz/PriceBiz.java +++ b/src/main/java/com/ycwl/basic/biz/PriceBiz.java @@ -92,7 +92,6 @@ public class PriceBiz { if (Integer.valueOf(1).equals(scenicConfig.getAllFree())) { // 景区全免 respVO.setFree(true); - respVO.setPrice(BigDecimal.ZERO); respVO.setSlashPrice(BigDecimal.ZERO); return respVO; } @@ -100,7 +99,7 @@ public class PriceBiz { respVO.setConfigId(priceConfig.getId()); respVO.setGoodsIds(goodsIds); respVO.setType(type); - respVO.setPrice(priceConfig.getPrice()); + respVO.setOrigPrice(priceConfig.getPrice()); respVO.setSlashPrice(priceConfig.getSlashPrice()); // 查询用户是否有此类订单 diff --git a/src/main/java/com/ycwl/basic/model/mobile/order/IsBuyBatchRespVO.java b/src/main/java/com/ycwl/basic/model/mobile/order/IsBuyBatchRespVO.java index 7c4721e..854b79e 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/order/IsBuyBatchRespVO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/order/IsBuyBatchRespVO.java @@ -12,6 +12,11 @@ public class IsBuyBatchRespVO { private Integer configId; private int type; private String goodsIds; - private BigDecimal price; - private BigDecimal slashPrice; + private BigDecimal origPrice = BigDecimal.ZERO; + private BigDecimal couponPrice = BigDecimal.ZERO; + private BigDecimal slashPrice = BigDecimal.ZERO; + + public BigDecimal getPrice() { + return origPrice.subtract(couponPrice); + } } diff --git a/src/main/java/com/ycwl/basic/model/mobile/order/IsBuyRespVO.java b/src/main/java/com/ycwl/basic/model/mobile/order/IsBuyRespVO.java index 4dd2af3..3956d16 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/order/IsBuyRespVO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/order/IsBuyRespVO.java @@ -11,6 +11,11 @@ public class IsBuyRespVO { private Long orderId; private int goodsType; private Long goodsId; - private BigDecimal price; - private BigDecimal slashPrice; + private BigDecimal origPrice = BigDecimal.ZERO; + private BigDecimal couponPrice = BigDecimal.ZERO; + private BigDecimal slashPrice = BigDecimal.ZERO; + + public BigDecimal getPrice() { + return origPrice.subtract(couponPrice); + } }