~jiangyouyao/beauty-erp.git

			@@ -15,6 +15,15 @@
			public class ShopShoppingCart extends EntityDTOExt {
			@Extend
			private static final long serialVersionUID = 1L;
			/**
			*购物车类型-直接购买
			*/
			public static final int CAR_TYPE_MICRO =1;
			/**
			*购物车类型-积分兑换
			*/
			public static final int CAR_TYPE_SCORE=2;



			/**
			@@ -26,7 +35,7 @@
			/**
			* 用户ID
			*/
			private String cartUserId;
			private Long cartUserId;


			/**
			@@ -50,6 +59,12 @@
			* 用户是否选中 1选中 2未选中
			*/
			private Integer isSelected;
			/**
			* 购物车类型 1直接支付 2积分兑换
			*/
			private Integer cartType;



			/**
			* 门店id
			@@ -67,6 +82,16 @@
			*/
			@Extend
			private BigDecimal price;
			/**
			* 积分兑换所需支付金额
			*/
			@Extend
			private BigDecimal scorePrice;
			/**
			* 积分兑换所需支付积分
			*/
			@Extend
			private Integer scoreCount;

			/**
			* 产品手机端封面地址
			@@ -165,6 +190,22 @@
			this.increaseAndDecrease = increaseAndDecrease;
			}

			public BigDecimal getScorePrice() {
			return scorePrice;
			}

			public void setScorePrice(BigDecimal scorePrice) {
			this.scorePrice = scorePrice;
			}

			public Integer getScoreCount() {
			return scoreCount;
			}

			public void setScoreCount(Integer scoreCount) {
			this.scoreCount = scoreCount;
			}

			public Integer getModifyCartNumber() {
			return modifyCartNumber;
			}
			@@ -257,11 +298,11 @@
			}


			public String getCartUserId() {
			public Long getCartUserId() {
			return cartUserId;
			}

			public void setCartUserId(String cartUserId) {
			public void setCartUserId(Long cartUserId) {
			this.cartUserId=cartUserId;
			}

			@@ -325,5 +366,11 @@
			return shopCoupons;
			}

			public Integer getCartType() {
			return cartType;
			}

			public void setCartType(Integer cartType) {
			this.cartType = cartType;
			}
			}