~jiangyouyao/beauty-erp.git

			@@ -2,6 +2,7 @@

			import com.matrix.system.shopXcx.bean.ShopCoupon;
			import com.matrix.system.shopXcx.bean.ShopShoppingCart;
			import lombok.Data;

			import java.math.BigDecimal;
			import java.util.List;
			@@ -9,90 +10,33 @@
			/**
			* 购物车前台展示对象
			*/
			@Data
			public class ShopCartVo {

			private ShopCoupon coupon;
			private ShopCoupon coupon;

			private CouponReceiveInfoVO couponReceiveInfoVO;
			private CouponReceiveInfoVO couponReceiveInfoVO;

			public CouponReceiveInfoVO getCouponReceiveInfoVO() {
			return couponReceiveInfoVO;
			}

			public void setCouponReceiveInfoVO(CouponReceiveInfoVO couponReceiveInfoVO) {
			this.couponReceiveInfoVO = couponReceiveInfoVO;
			}
			//是否满足优惠
			private boolean satisfactionCoupon;

			//是否满足优惠
			private boolean satisfactionCoupon;
			private List<ShopShoppingCart> cartList;

			private List<ShopShoppingCart> cartList;
			//提示语
			private String msg = "";

			//提示语
			private String msg="";
			//优惠小计金额
			private BigDecimal subtotal = BigDecimal.ZERO;

			//优惠小计金额
			private BigDecimal subtotal=BigDecimal.ZERO;
			//原价
			private BigDecimal srcPrice = BigDecimal.ZERO;

			//原价
			private BigDecimal srcPrice=BigDecimal.ZERO;
			//优惠金额
			private BigDecimal couponPrice = BigDecimal.ZERO;
			/**
			* 抵用积分
			*/
			private BigDecimal scorePay = BigDecimal.ZERO;

			//优惠金额
			private BigDecimal couponPrice=BigDecimal.ZERO;

			public ShopCoupon getCoupon() {
			return coupon;
			}

			public void setCoupon(ShopCoupon coupon) {
			this.coupon = coupon;
			}

			public boolean isSatisfactionCoupon() {
			return satisfactionCoupon;
			}

			public void setSatisfactionCoupon(boolean satisfactionCoupon) {
			this.satisfactionCoupon = satisfactionCoupon;
			}

			public List<ShopShoppingCart> getCartList() {
			return cartList;
			}

			public void setCartList(List<ShopShoppingCart> cartList) {
			this.cartList = cartList;
			}

			public String getMsg() {
			return msg;
			}

			public void setMsg(String msg) {
			this.msg = msg;
			}

			public BigDecimal getSubtotal() {
			return subtotal;
			}

			public void setSubtotal(BigDecimal subtotal) {
			this.subtotal = subtotal;
			}

			public BigDecimal getSrcPrice() {
			return srcPrice;
			}

			public void setSrcPrice(BigDecimal srcPrice) {
			this.srcPrice = srcPrice;
			}

			public BigDecimal getCouponPrice() {
			return couponPrice;
			}

			public void setCouponPrice(BigDecimal couponPrice) {
			this.couponPrice = couponPrice;
			}
			}