From 95f9ea7eb339c36cade6c67d0385c49ec2d81477 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 14 Apr 2021 19:39:45 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopShoppingCart.java | 105 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 76 insertions(+), 29 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 7259104..4f27e07 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
@@ -14,33 +14,42 @@
*/
public class ShopShoppingCart extends EntityDTOExt {
@Extend
- private static final long serialVersionUID = 1L;
+ 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;
-
-
+ private Long cartUserId;
+
+
/**
* 产品ID
*/
private Integer cartProductId;
-
-
+
+
/**
* 规格ID
*/
private Integer cartSkuId;
-
-
+
+
/**
* 数量
*/
@@ -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;
}
@@ -251,44 +292,44 @@
public Integer getCartId() {
return cartId;
}
-
- public void setCartId(Integer cartId) {
+
+ public void setCartId(Integer cartId) {
this.cartId=cartId;
}
-
- public String getCartUserId() {
+
+ public Long getCartUserId() {
return cartUserId;
}
-
- public void setCartUserId(String cartUserId) {
+
+ public void setCartUserId(Long 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;
}
@@ -318,12 +359,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