From 60a099a7edfd81a3b10c766e113c019cdef6cd3d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 五月 2020 16:08:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/order/OrderMoneyDailyCount.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 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 a23817b..07b16f7 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
@@ -14,7 +14,39 @@
*/
@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_tb.png"),
+ juHuaSuan("鑱氬垝绠�", "http://img.flqapp.com/resource/icon/source_type_tb.png"),
+ huangLv("鑸梾", "http://img.flqapp.com/resource/icon/source_type_elme.png"),
+ kouBei("鍙ｇ", "http://img.flqapp.com/resource/icon/source_type_elme.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("id")
private String id;
@@ -23,7 +55,10 @@
private Long uid; // 涓婄骇id
@Field("sourceType")
- private String sourceType; // 鏉ユ簮绫诲瀷
+ private SourceTypeEnum sourceType; // 鏉ユ簮绫诲瀷
+
+ @Field("yearMonth")
+ private String yearMonth; // 缁熻鏃ユ湡-瀛楃涓�
@Field("countDay")
private Date countDay; // 缁熻鏃ユ湡
@@ -42,6 +77,8 @@
@Field("updateTime")
private Date updateTime; // 鏇存柊鏃堕棿
+
+
public String getId() {
return id;
@@ -107,12 +144,19 @@
this.updateTime = updateTime;
}
- public String getSourceType() {
+ public SourceTypeEnum getSourceType() {
return sourceType;
}
- public void setSourceType(String sourceType) {
+ public void setSourceType(SourceTypeEnum sourceType) {
this.sourceType = sourceType;
}
+ public String getYearMonth() {
+ return yearMonth;
+ }
+
+ public void setYearMonth(String yearMonth) {
+ this.yearMonth = yearMonth;
+ }
}
--
Gitblit v1.8.0