From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复

---
 fanli/src/main/java/com/yeshi/fanli/entity/order/OrderMoneyDailyCount.java |   90 +++++++++++++++++++++++++++++----------------
 1 files changed, 58 insertions(+), 32 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..754db8f 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
@@ -3,6 +3,7 @@
 import java.util.Date;
 
 import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
 
@@ -15,61 +16,78 @@
 @Document(collection = "order_money_daily_count")
 public class OrderMoneyDailyCount {
 
-	public enum SourceTypeEnum {
-		taobao("娣樺疂", "http://img.flqapp.com/resource/icon/source_type_tb.png"),
-		tmall("澶╃尗", "http://img.flqapp.com/resource/icon/source_type_tm.png"),
-		tmallGlobal("澶╃尗鍥介檯", "http://img.flqapp.com/resource/icon/source_type_tm_inter.png"),
-		juHuaSuan("鑱氬垝绠�", "http://img.flqapp.com/resource/icon/source_type_juhuasuan.png"),
-		huangLv("鑸梾", "http://img.flqapp.com/resource/icon/source_type_hanglv.png"),
-		kouBei("鍙ｇ", "http://img.flqapp.com/resource/icon/source_type_koubei.png"),
-		elme("楗夸簡涔�", "http://img.flqapp.com/resource/icon/source_type_elme.png"),
-		jingDong("浜笢", "http://img.flqapp.com/resource/icon/source_type_jd.png"),
-		pinDuoDuo("鎷煎澶�", "http://img.flqapp.com/resource/icon/source_type_pdd.png");
-
-		private final String desc;
-		private final String icon;
-
-		private SourceTypeEnum(String desc, String icon) {
-			this.desc = desc;
-			this.icon = icon;
-		}
-
-		public String getDesc() {
-			return desc;
-		}
-
-		public String getIcon() {
-			return icon;
-		}
-	}
-
 	@Id
 	@Field
 	private String id;
+	@Indexed
 	@Field
 	private Long uid; // 涓婄骇id
 	@Field
 	private SourceTypeEnum sourceType; // 鏉ユ簮绫诲瀷
+	@Indexed
 	@Field
 	private String yearMonth; // 缁熻鏃ユ湡-瀛楃涓�
+	@Indexed
 	@Field
 	private Date countDay; // 缁熻鏃ユ湡
 	@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 teamDividentsOrderNum;// 鍙備笌鍒嗙孩鐨勮鍗曟暟閲�
+	@Field
+	private Integer directOrderNum;// 鐩存帴璁㈠崟鏁伴噺
+	@Field
+	private Integer inDirectOrderNum;// 闂存帴璁㈠崟鏁伴噺
+	@Field
+	private Integer beyondOrderNum;// 浜岀骇澶栬鍗曟暟閲�
+
+	public OrderMoneyDailyCount() {
+	}
+
+	public OrderMoneyDailyCount(Integer directOrderNum, Integer inDirectOrderNum, Integer beyondOrderNum) {
+		this.directOrderNum = directOrderNum;
+		this.inDirectOrderNum = inDirectOrderNum;
+		this.beyondOrderNum = 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; // 鏇存柊鏃堕棿
 
@@ -185,4 +203,12 @@
 		this.updateTime = updateTime;
 	}
 
+	public Integer getTeamDividentsOrderNum() {
+		return teamDividentsOrderNum;
+	}
+
+	public void setTeamDividentsOrderNum(Integer teamDividentsOrderNum) {
+		this.teamDividentsOrderNum = teamDividentsOrderNum;
+	}
+
 }

--
Gitblit v1.8.0