From 9108fe37516a05b7af57953cb036e361ae3c86d2 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 19 Mar 2021 16:00:40 +0800
Subject: [PATCH] 积分商城8

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopShoppingCart.java |   64 ++++++++++++++++++-------------
 1 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopShoppingCart.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopShoppingCart.java
index a9c2ae4..fffc389 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopShoppingCart.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopShoppingCart.java
@@ -16,40 +16,40 @@
 	@Extend
 	private static final long serialVersionUID = 1L;
 	/**
-	 *购物车类型-微商城
+	 *购物车类型-直接购买
 	 */
 	public static  final int CAR_TYPE_MICRO =1;
 	/**
-	 *购物车类型-积分商城
+	 *购物车类型-积分兑换
 	 */
 	public static  final int CAR_TYPE_SCORE=2;
 
 
-	
+
 	/**
 	 * 主键
 	 */
 	private Integer  cartId;
-			
-	
+
+
 	/**
 	 * 用户ID
 	 */
 	private String  cartUserId;
-			
-	
+
+
 	/**
 	 * 产品ID
 	 */
 	private Integer  cartProductId;
-			
-	
+
+
 	/**
 	 * 规格ID
 	 */
 	private Integer  cartSkuId;
-			
-	
+
+
 	/**
 	 * 数量
 	 */
@@ -59,7 +59,10 @@
 	 * 用户是否选中 1选中  2未选中
 	 */
 	private Integer isSelected;
-
+	/**
+	 * 购物车类型 1直接支付  2积分兑换
+	 */
+	private Integer cartType;
 
 
 
@@ -263,44 +266,44 @@
 	public Integer getCartId() {
 		return cartId;
 	}
-   	
-   	public void setCartId(Integer cartId) {
+
+	public void setCartId(Integer cartId) {
 		this.cartId=cartId;
 	}
-   	
+
 
 	public String getCartUserId() {
 		return cartUserId;
 	}
-   	
-   	public void setCartUserId(String cartUserId) {
+
+	public void setCartUserId(String cartUserId) {
 		this.cartUserId=cartUserId;
 	}
-   	
+
 
 	public Integer getCartProductId() {
 		return cartProductId;
 	}
-   	
-   	public void setCartProductId(Integer cartProductId) {
+
+	public void setCartProductId(Integer cartProductId) {
 		this.cartProductId=cartProductId;
 	}
-   	
+
 
 	public Integer getCartSkuId() {
 		return cartSkuId;
 	}
-   	
-   	public void setCartSkuId(Integer cartSkuId) {
+
+	public void setCartSkuId(Integer cartSkuId) {
 		this.cartSkuId=cartSkuId;
 	}
-   	
+
 
 	public Integer getCartNumber() {
 		return cartNumber;
 	}
-   	
-   	public void setCartNumber(Integer cartNumber) {
+
+	public void setCartNumber(Integer cartNumber) {
 		this.cartNumber=cartNumber;
 	}
 
@@ -330,11 +333,18 @@
 
 	public void setShopCoupons(List<ShopCoupon> shopCoupons) {
 		this.shopCoupons=shopCoupons;
-		
+
 	}
 
 	public List<ShopCoupon> getShopCoupons() {
 		return shopCoupons;
 	}
 
+	public Integer getCartType() {
+		return cartType;
+	}
+
+	public void setCartType(Integer cartType) {
+		this.cartType = cartType;
+	}
 }
\ No newline at end of file

--
Gitblit v1.9.1