From e423d56d730db1baed24f3f7dbbc4141038776b6 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 18 Jun 2021 22:12:03 +0800
Subject: [PATCH] 修复每日业绩bug和优化赠送业绩计算方式

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java |   87 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java
index a0c163e..94b8b15 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java
@@ -2,7 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.matrix.core.anotations.Extend;
+import com.matrix.core.pojo.EntityDTO;
 import com.matrix.core.tools.DateUtil;
+import com.matrix.system.common.bean.EntityDTOExt;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -13,7 +15,7 @@
 /**
  * @date 2016-07-03 20:53
  */
-public class SysProjUse implements Serializable {
+public class SysProjUse extends EntityDTO {
 
     private static final long serialVersionUID = 1L;
 
@@ -44,19 +46,27 @@
     /**
      * 有效期
      */
+    @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8")
     @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
     private Date failTime;
+
+
+    private Date targetFailTime;
     /**
      * 套餐id
      */
     private Long taocanId;
 
-
-
     /**
      * 订单明细id 不明确
      */
     private Long orderItemId;
+
+    /**
+     * 订单id
+     */
+    @Extend
+    private Long orderId;
 
     /**
      * 单次扣减金额（理解为单次手工业绩）
@@ -115,10 +125,81 @@
     private String isCourse;
 
     /**
+     * 任选套餐 是否无限次 Y-是 N-否
+     */
+    private String isInfinite;
+
+    /**
      * 单次划扣次数
      */
     private Integer deductionNum;
 
+    private Integer timeLength;
+
+    private String img;
+
+    private String queryKey;
+
+    @Extend
+    private String updateRemark;
+
+
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getUpdateRemark() {
+        return updateRemark;
+    }
+
+    public void setUpdateRemark(String updateRemark) {
+        this.updateRemark = updateRemark;
+    }
+
+    public Date getTargetFailTime() {
+        return targetFailTime;
+    }
+
+    public void setTargetFailTime(Date targetFailTime) {
+        this.targetFailTime = targetFailTime;
+    }
+
+    public String getQueryKey() {
+        return queryKey;
+    }
+
+    public void setQueryKey(String queryKey) {
+        this.queryKey = queryKey;
+    }
+
+    public Integer getTimeLength() {
+        return timeLength;
+    }
+
+    public void setTimeLength(Integer timeLength) {
+        this.timeLength = timeLength;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+
+    public String getIsInfinite() {
+        return isInfinite;
+    }
+
+    public void setIsInfinite(String isInfinite) {
+        this.isInfinite = isInfinite;
+    }
+
     public String getIsCourse() {
         return isCourse;
     }

--
Gitblit v1.9.1