From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 171 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java
index e75be3b..7eae13c 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java
@@ -2,6 +2,7 @@
import com.matrix.core.anotations.Extend;
import com.matrix.core.tools.DateUtil;
+import com.matrix.core.tools.StringUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -209,7 +210,7 @@
/**
* 单会员是否只买一次
*/
- private String isOnce;
+ private Integer isOnce;
/**
* 销售平台
@@ -393,7 +394,173 @@
*/
private Integer isDel;
+ /**
+ * 购买有效期
+ */
+ private String buyValid;
+ /**
+ * 购买有效期单位 - 扩展字段用于参数接收 y/m/d
+ */
+ private String buyDateUnit;
+
+ /**
+ * 购买有效期时长
+ */
+ private Integer buyDateNum;
+
+ /**
+ * 消耗有效期
+ */
+ private String useValid;
+
+ /**
+ * 消耗有效期单位 - 扩展字段用于参数接收 y/m/d
+ */
+ private String useDateUnit;
+
+ /**
+ * 消耗有效期时长
+ */
+ private Integer useDateNum;
+
+ /**
+ * 统一失效时间
+ */
+ private Date invalidTime;
+
+ /**
+ * 任选套餐是否无限次 N-否 Y-是
+ */
+ private String isInfinite;
+ /**
+ *业绩规则id
+ */
+ private Long achieveRuleId;
+
+ /**
+ *业绩规则名称
+ */
+ @Extend
+ private String achieveRuleName;
+
+ /**
+ * 支付方式 1-充值本金 2-赠送金额 3-积分
+ */
+ private String payMethods;
+
+ /**
+ * 是否合作项目
+ */
+ private Integer isCooperate;
+
+ public Integer getIsCooperate() {
+ return isCooperate;
+ }
+
+ public void setIsCooperate(Integer isCooperate) {
+ this.isCooperate = isCooperate;
+ }
+
+ public String getAchieveRuleName() {
+ return achieveRuleName;
+ }
+
+ public void setAchieveRuleName(String achieveRuleName) {
+ this.achieveRuleName = achieveRuleName;
+ }
+
+ public Long getAchieveRuleId() {
+ return achieveRuleId;
+ }
+
+ public void setAchieveRuleId(Long achieveRuleId) {
+ this.achieveRuleId = achieveRuleId;
+ }
+
+ public String getPayMethods() {
+ return payMethods;
+ }
+
+ public void setPayMethods(String payMethods) {
+ this.payMethods = payMethods;
+ }
+
+ public String getIsInfinite() {
+ return isInfinite;
+ }
+
+ public void setIsInfinite(String isInfinite) {
+ this.isInfinite = isInfinite;
+ }
+
+ public Integer getBuyDateNum() {
+ return buyDateNum;
+ }
+
+ public void setBuyDateNum(Integer buyDateNum) {
+ this.buyDateNum = buyDateNum;
+ }
+
+ public Integer getUseDateNum() {
+ return useDateNum;
+ }
+
+ public void setUseDateNum(Integer useDateNum) {
+ this.useDateNum = useDateNum;
+ }
+
+ public String getBuyValid() {
+ return buyValid;
+ }
+
+ public void setBuyValid(String buyValid) {
+ if (StringUtils.isNotBlank(buyValid)) {
+ if (buyValid.contains("Y") || buyValid.contains("M") || buyValid.contains("D")) {
+ this.buyDateUnit = buyValid.substring(buyValid.length() - 1);
+ this.buyDateNum = Integer.parseInt(buyValid.substring(0, buyValid.length() - 1));
+ }
+ }
+ this.buyValid = buyValid;
+ }
+
+ public String getBuyDateUnit() {
+ return buyDateUnit;
+ }
+
+ public void setBuyDateUnit(String buyDateUnit) {
+ this.buyDateUnit = buyDateUnit;
+ }
+
+ public String getUseValid() {
+ return useValid;
+ }
+
+ public void setUseValid(String useValid) {
+ if (StringUtils.isNotBlank(useValid)) {
+ if (useValid.contains("Y") || useValid.contains("M") || useValid.contains("D")) {
+ this.useDateUnit = useValid.substring(useValid.length() - 1);
+ this.useDateNum = Integer.parseInt(useValid.substring(0, useValid.length() - 1));
+ }
+ }
+ this.useValid = useValid;
+ }
+
+ public String getUseDateUnit() {
+ return useDateUnit;
+ }
+
+ public void setUseDateUnit(String useDateUnit) {
+ this.useDateUnit = useDateUnit;
+ }
+
+ public Date getInvalidTime() {
+ return invalidTime;
+ }
+
+ public void setInvalidTime(Date invalidTime) {
+ this.invalidTime = invalidTime;
+ }
public Integer getIsDel() {
return isDel;
@@ -848,11 +1015,12 @@
this.saleOffTime = saleOffTime;
}
- public String getIsOnce() {
+
+ public Integer getIsOnce() {
return isOnce;
}
- public void setIsOnce(String isOnce) {
+ public void setIsOnce(Integer isOnce) {
this.isOnce = isOnce;
}
--
Gitblit v1.9.1