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/hive/bean/ShoppingGoods.java |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 53 insertions(+), 1 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 32be44f..9824694 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
@@ -425,10 +425,62 @@
     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;
+
+    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;
     }

--
Gitblit v1.9.1