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/ShopSku.java | 68 +++++++++++++++++++++++++++++++++-
1 files changed, 66 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 5b504d2..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;
/**
@@ -51,9 +51,32 @@
private BigDecimal price;
/**
- * 积分
+ *自购提成
+ */
+ private BigDecimal selfPrice;
+ /**
+ *推广提成
+ */
+ private BigDecimal sealesPrice;
+ /**
+ *邀请提成
+ */
+ private BigDecimal invitationPrice;
+
+ /**
+ * 消费可得积分
*/
private Integer score;
+
+ /**
+ * 积分兑换所需支付金额
+ */
+ private BigDecimal scorePrice;
+ /**
+ * 积分兑换所需支付积分
+ */
+ private Integer scoreCount;
+
/**
* 排序
@@ -81,6 +104,31 @@
@Extend
private String goodsName;
+
+
+ public Integer getScoreCount() {
+ return scoreCount;
+ }
+
+ public void setScoreCount(Integer scoreCount) {
+ this.scoreCount = scoreCount;
+ }
+
+ public BigDecimal getSealesPrice() {
+ return sealesPrice;
+ }
+
+ public void setSealesPrice(BigDecimal sealesPrice) {
+ this.sealesPrice = sealesPrice;
+ }
+
+ public BigDecimal getInvitationPrice() {
+ return invitationPrice;
+ }
+
+ public void setInvitationPrice(BigDecimal invitationPrice) {
+ this.invitationPrice = invitationPrice;
+ }
public Long getCompanyId() {
return companyId;
@@ -225,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