From baa79615425b71521e67ec8a9344b88ce53fc5de Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 12 Mar 2021 13:47:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java | 106 +++++++++++++++++++++-------------------------------
1 files changed, 43 insertions(+), 63 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java
index 6a5a4f5..dcfc9cf 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java
@@ -72,7 +72,13 @@
* 客户id
*/
private Long vipId;
-
+
+
+
+ /**
+ * 购买业绩
+ */
+ private Double goodsCash;
/**
* 赠送消耗
@@ -85,29 +91,7 @@
*/
private Double hisConsume;
-
- /**
- * 划扣金额 从卡中划扣钱买东西
- */
- private Double consume;
-
-
- /**
- * 卡项,套餐,充值，开会籍卡
- */
- private Double cardCash;
-
-
- /**
- * 现金单次，购买项目的业绩
- */
- private Double projCash;
-
-
- /**
- * 现金产品，购买家居产品的钱
- */
- private Double goodsCash;
+
/**
@@ -155,11 +139,12 @@
* 总金额
*/
private Double zkTotal;
+
/**
* 公司id
*/
private Long companyId;
-
+
private String t1;
@@ -167,11 +152,11 @@
/**
- * 业绩种类 1-现金业绩 2-划扣业绩
+ * 业绩类型
*/
- private String t3;
-
-
+ private String achieveType;
+
+
private String t4;
@@ -251,17 +236,32 @@
private Date endTime;
- /**
- * 分配的业绩金额
- */
- @Extend
- private Double achieveMoney;
private String goodsNo;
private String goodsName;
private String type;
+
+ private String payMethod;
+
+ private String cateName;
+
+ public String getCateName() {
+ return cateName;
+ }
+
+ public void setCateName(String cateName) {
+ this.cateName = cateName;
+ }
+
+ public String getPayMethod() {
+ return payMethod;
+ }
+
+ public void setPayMethod(String payMethod) {
+ this.payMethod = payMethod;
+ }
public String getType() {
return type;
@@ -311,13 +311,6 @@
this.companyId = companyId;
}
- public Double getAchieveMoney() {
- return achieveMoney;
- }
-
- public void setAchieveMoney(Double achieveMoney) {
- this.achieveMoney = achieveMoney;
- }
public Date getBeginTime() {
return beginTime;
@@ -403,24 +396,8 @@
public void setHisConsume(Double hisConsume) {
this.hisConsume = hisConsume;
}
- public Double getConsume() {
- return consume;
- }
- public void setConsume(Double consume) {
- this.consume = consume;
- }
- public Double getCardCash() {
- return cardCash;
- }
- public void setCardCash(Double cardCash) {
- this.cardCash = cardCash;
- }
- public Double getProjCash() {
- return projCash;
- }
- public void setProjCash(Double projCash) {
- this.projCash = projCash;
- }
+
+
public Double getGoodsCash() {
return goodsCash;
}
@@ -481,12 +458,15 @@
public void setT2(String t2) {
this.t2 = t2;
}
- public String getT3() {
- return t3;
+
+ public String getAchieveType() {
+ return achieveType;
}
- public void setT3(String t3) {
- this.t3 = t3;
+
+ public void setAchieveType(String achieveType) {
+ this.achieveType = achieveType;
}
+
public String getT4() {
return t4;
}
--
Gitblit v1.9.1