From 393d296e43f0e5f11e524cab5446bcd3eee94e89 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 12 Jun 2021 17:47:38 +0800
Subject: [PATCH] 新增赠送项目是否计算消耗控制

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopSku.java |   44 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopSku.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopSku.java
index 4e53f55..5597740 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopSku.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopSku.java
@@ -12,7 +12,7 @@
  */
 public class ShopSku  extends EntityDTO{
 	@Extend
-	private static final long serialVersionUID = 1L; 
+	private static final long serialVersionUID = 1L;
 
 	
 	/**
@@ -49,6 +49,11 @@
 	 * 价格
 	 */
 	private BigDecimal price;
+
+	/**
+	 *自购提成
+	 */
+	private BigDecimal selfPrice;
 	/**
 	 *推广提成
 	 */
@@ -59,9 +64,19 @@
 	private BigDecimal invitationPrice;
 
 	/**
-	 * 积分
+	 * 消费可得积分
 	 */
 	private Integer score;
+
+	/**
+	 * 积分兑换所需支付金额
+	 */
+	private BigDecimal scorePrice;
+	/**
+	 * 积分兑换所需支付积分
+	 */
+	private Integer scoreCount;
+
 
 	/**
 	 * 排序
@@ -89,6 +104,15 @@
 
 	@Extend
 	private String goodsName;
+
+
+	public Integer getScoreCount() {
+		return scoreCount;
+	}
+
+	public void setScoreCount(Integer scoreCount) {
+		this.scoreCount = scoreCount;
+	}
 
 	public BigDecimal getSealesPrice() {
 		return sealesPrice;
@@ -249,10 +273,26 @@
 		this.goodsName = goodsName;
 	}
 
+	public BigDecimal getScorePrice() {
+		return scorePrice;
+	}
+
+	public void setScorePrice(BigDecimal scorePrice) {
+		this.scorePrice = scorePrice;
+	}
+
 	@Override
 	public boolean equals(Object obj) {
 		//这里以name为判定标准。
 		return id.equals(((ShopSku) obj).getId());
 	}
 
+	public BigDecimal getSelfPrice() {
+		return selfPrice;
+	}
+
+	public void setSelfPrice(BigDecimal selfPrice) {
+		this.selfPrice = selfPrice;
+	}
+
 }
\ No newline at end of file

--
Gitblit v1.9.1