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/AchieveNew.java | 212 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 140 insertions(+), 72 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 b768fbb..3c68bcd 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
@@ -1,21 +1,23 @@
package com.matrix.system.hive.bean;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.anotations.Extend;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
+import com.matrix.system.common.bean.EntityDTOExt;
import org.springframework.format.annotation.DateTimeFormat;
-import java.io.Serializable;
import java.util.Date;
/**
*
* @date 2019-03-24 23:55
*/
-public class AchieveNew implements Serializable{
+public class AchieveNew extends EntityDTOExt {
@Extend
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
-
+ @TableId(type = IdType.AUTO)
private Long id;
@@ -26,7 +28,7 @@
/**
- * 美疗师id
+ * 美疗师id 把这个字段视为正式的业绩归属人
*/
private Long beaultId;
@@ -72,7 +74,15 @@
* 客户id
*/
private Long vipId;
-
+
+
+
+ /**
+ * 购买业绩
+ */
+ private Double goodsCash;
+
+ private Double cardCash;
/**
* 赠送消耗
@@ -85,29 +95,7 @@
*/
private Double hisConsume;
-
- /**
- * 划扣金额 从卡中划扣钱买东西
- */
- private Double consume;
-
-
- /**
- * 卡项,套餐,充值，开会籍卡
- */
- private Double cardCash;
-
-
- /**
- * 现金单次，购买项目的业绩
- */
- private Double projCash;
-
-
- /**
- * 现金产品，购买家居产品的钱
- */
- private Double goodsCash;
+
/**
@@ -155,20 +143,24 @@
* 总金额
*/
private Double zkTotal;
+
/**
* 公司id
*/
private Long companyId;
-
+
private String t1;
private String t2;
-
-
- private String t3;
-
-
+
+
+ /**
+ * 业绩类型
+ */
+ private String achieveType;
+
+
private String t4;
@@ -200,6 +192,10 @@
private String day;
+ private String vipQueryKey;
+
+ private Long achieveRuleId;
+
/**
* 订单编号
@@ -227,29 +223,114 @@
*/
private String meiliao;
+ private Integer arriveCnt;
+
/**
* 开始时间
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date beginTime;
/**
* 结束时间
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date endTime;
- /**
- * 分配的业绩金额
- */
- @Extend
- private Double achieveMoney;
+ private String goodsNo;
+
+ private String goodsName;
+
+ private String type;
+
+ private String payMethod;
+
+ private String cateName;
+
+ /**
+ * 业绩规则名称
+ */
+ private String achieveRuleName;
+
+ public String getAchieveRuleName() {
+ return achieveRuleName;
+ }
+
+ public void setAchieveRuleName(String achieveRuleName) {
+ this.achieveRuleName = achieveRuleName;
+ }
+
+ public Double getCardCash() {
+ return cardCash;
+ }
+
+ public void setCardCash(Double cardCash) {
+ this.cardCash = cardCash;
+ }
+
+ 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;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getGoodsNo() {
+ return goodsNo;
+ }
+
+ public void setGoodsNo(String goodsNo) {
+ this.goodsNo = goodsNo;
+ }
+
+ public String getGoodsName() {
+ return goodsName;
+ }
+
+ public void setGoodsName(String goodsName) {
+ this.goodsName = goodsName;
+ }
+
+ public Integer getArriveCnt() {
+ return arriveCnt;
+ }
+
+ public void setArriveCnt(Integer arriveCnt) {
+ this.arriveCnt = arriveCnt;
+ }
+
+ public String getVipQueryKey() {
+ return vipQueryKey;
+ }
+
+ public void setVipQueryKey(String vipQueryKey) {
+ this.vipQueryKey = vipQueryKey;
+ }
public Long getCompanyId() {
return companyId;
@@ -259,13 +340,6 @@
this.companyId = companyId;
}
- public Double getAchieveMoney() {
- return achieveMoney;
- }
-
- public void setAchieveMoney(Double achieveMoney) {
- this.achieveMoney = achieveMoney;
- }
public Date getBeginTime() {
return beginTime;
@@ -351,24 +425,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;
}
@@ -429,12 +487,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;
}
@@ -484,6 +545,13 @@
this.day = day;
}
+ public Long getAchieveRuleId() {
+ return achieveRuleId;
+ }
+
+ public void setAchieveRuleId(Long achieveRuleId) {
+ this.achieveRuleId = achieveRuleId;
+ }
public String getOrderNo() {
return orderNo;
--
Gitblit v1.9.1