From dafde3b367e679405ae188106ccbd1b9e522998a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 五月 2020 12:02:19 +0800
Subject: [PATCH] 订单资金统计数据更改

---
 fanli/src/main/java/com/yeshi/fanli/entity/order/OrderMoneyDailyCount.java |   39 +++++++++++++++++++++++++++++++++++----
 1 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/order/OrderMoneyDailyCount.java b/fanli/src/main/java/com/yeshi/fanli/entity/order/OrderMoneyDailyCount.java
index 0d0ce4d..c5a6d8c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/order/OrderMoneyDailyCount.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/order/OrderMoneyDailyCount.java
@@ -57,20 +57,51 @@
 	@Field
 	private Integer income; // 鏀跺叆-鎴戠殑鏀剁泭 X 100
 	@Field
-	private Integer incomeTeam; // 鏀跺叆-鍥㈤槦鏀剁泭 X 100
+	private Integer incomeTeam; // 鏀跺叆-鍥㈤槦鏀剁泭 X 100锛堜簩绾у唴锛�
 	@Field
 	private Integer orderNum; // 璁㈠崟鏁伴噺-鎴戠殑
 	@Field
-	private Integer orderNumTeam; // 璁㈠崟鏁伴噺-鍥㈤槦
+	private Integer orderNumTeam; // 璁㈠崟鏁伴噺-鍥㈤槦(浜岀骇鍐�)
 	@Field
-	private Integer teamReward; // 鍥㈤槦濂栧姳  X 100
+	private Integer teamReward; // 鍥㈤槦濂栧姳 X 100 
 	@Field
 	private Integer teamRewardNum; // 鍥㈤槦濂栧姳璁㈠崟鏁伴噺
 	@Field
-	private Integer teamSubsidy; // 鍥㈤槦琛ヨ创  X 100
+	private Integer teamSubsidy; // 鍥㈤槦琛ヨ创 X 100
 	@Field
 	private Integer teamSubsidyNum; // 鍥㈤槦琛ヨ创璁㈠崟鏁伴噺
 	@Field
+	private Integer directOrderNum;// 鐩存帴璁㈠崟鏁伴噺
+	@Field
+	private Integer inDirectOrderNum;// 闂存帴璁㈠崟鏁伴噺
+	@Field
+	private Integer beyondOrderNum;// 浜岀骇澶栬鍗曟暟閲�
+
+	public Integer getDirectOrderNum() {
+		return directOrderNum;
+	}
+
+	public void setDirectOrderNum(Integer directOrderNum) {
+		this.directOrderNum = directOrderNum;
+	}
+
+	public Integer getInDirectOrderNum() {
+		return inDirectOrderNum;
+	}
+
+	public void setInDirectOrderNum(Integer inDirectOrderNum) {
+		this.inDirectOrderNum = inDirectOrderNum;
+	}
+
+	public Integer getBeyondOrderNum() {
+		return beyondOrderNum;
+	}
+
+	public void setBeyondOrderNum(Integer beyondOrderNum) {
+		this.beyondOrderNum = beyondOrderNum;
+	}
+
+	@Field
 	private Date updateTime; // 鏇存柊鏃堕棿
 
 	public String getId() {

--
Gitblit v1.8.0