From 4dab41eef4ffde0c2631fbc7147cd2eee3cd0780 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 04 Mar 2021 18:57:56 +0800
Subject: [PATCH] 优化订单业绩
---
zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java | 96 ++++++++++++++++--------------------------------
1 files changed, 32 insertions(+), 64 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 a7bc0c8..eb15819 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,30 +91,7 @@
*/
private Double hisConsume;
-
- /**
- * 划扣金额 从卡中划扣钱买东西
- */
- private Double consume;
-
-
- /**
- * 卡项,套餐,充值，开会籍卡
- */
- private Double cardCash;
-
-
- /**
- * 现金单次，购买项目的业绩
- */
- @Deprecated
- private Double projCash;
-
-
- /**
- * 现金产品，购买家居产品的钱
- */
- private Double goodsCash;
+
/**
@@ -156,11 +139,12 @@
* 总金额
*/
private Double zkTotal;
+
/**
* 公司id
*/
private Long companyId;
-
+
private String t1;
@@ -168,13 +152,11 @@
/**
- * 岗位业绩
- */
- private String t3;
-
- /**
* 业绩类型
*/
+ private String achieveType;
+
+
private String t4;
@@ -254,16 +236,22 @@
private Date endTime;
- /**
- * 分配的业绩金额
- */
- private Double achieveMoney;
private String goodsNo;
private String goodsName;
private String type;
+
+ private String payMethod;
+
+ public String getPayMethod() {
+ return payMethod;
+ }
+
+ public void setPayMethod(String payMethod) {
+ this.payMethod = payMethod;
+ }
public String getType() {
return type;
@@ -313,13 +301,6 @@
this.companyId = companyId;
}
- public Double getAchieveMoney() {
- return achieveMoney;
- }
-
- public void setAchieveMoney(Double achieveMoney) {
- this.achieveMoney = achieveMoney;
- }
public Date getBeginTime() {
return beginTime;
@@ -405,24 +386,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;
}
@@ -483,12 +448,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