From e1cc4a8ac8250d8f76d4d85f49b2b00a4047f0c9 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 11 Sep 2021 17:40:53 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopSku.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 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 5d5b051..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
@@ -49,6 +49,11 @@
* 价格
*/
private BigDecimal price;
+
+ /**
+ *自购提成
+ */
+ private BigDecimal selfPrice;
/**
*推广提成
*/
@@ -64,10 +69,13 @@
private Integer score;
/**
- * 积分兑换价格
+ * 积分兑换所需支付金额
*/
- private Integer scorePrice;
-
+ private BigDecimal scorePrice;
+ /**
+ * 积分兑换所需支付积分
+ */
+ private Integer scoreCount;
/**
@@ -96,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;
@@ -256,11 +273,11 @@
this.goodsName = goodsName;
}
- public Integer getScorePrice() {
+ public BigDecimal getScorePrice() {
return scorePrice;
}
- public void setScorePrice(Integer scorePrice) {
+ public void setScorePrice(BigDecimal scorePrice) {
this.scorePrice = scorePrice;
}
@@ -270,4 +287,12 @@
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