From e892ea04b56194b6208b5a902f1622f40d4c56a7 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 10 Jul 2021 09:10:08 +0800
Subject: [PATCH] 新增美度正式环境配置

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java |   50 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 47 insertions(+), 3 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 eb15819..8f498a0 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
@@ -3,15 +3,15 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.matrix.core.anotations.Extend;
 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; 
 
@@ -26,7 +26,7 @@
 			
 	
 	/**
-	 * 美疗师id
+	 * 美疗师id  把这个字段视为正式的业绩归属人
 	 */
 	private Long  beaultId;
 			
@@ -79,6 +79,8 @@
 	 * 购买业绩
 	 */
 	private Double  goodsCash;
+
+	private Double cardCash;
 	
 	/**
 	 * 赠送消耗
@@ -190,6 +192,8 @@
 
 	private String vipQueryKey;
 
+	private Long achieveRuleId;
+
 
 	/**
 	 * 订单编号
@@ -226,6 +230,7 @@
 	 * 开始时间
 	 */
 	@DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
 	private Date  beginTime;
 			
 	
@@ -233,6 +238,7 @@
 	 * 结束时间
 	 */
 	@DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
 	private Date  endTime;
 
 
@@ -244,6 +250,37 @@
 	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;
@@ -506,6 +543,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