From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/entity/order/OrderMoneyDailyCount.java | 185 ++++++++++++++++++++++++++++++++--------------
1 files changed, 128 insertions(+), 57 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 07b16f7..0c4265e 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
@@ -1,34 +1,35 @@
package com.yeshi.fanli.entity.order;
-import java.math.BigDecimal;
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;
/**
* 璁㈠崟鐩稿叧璧勯噾缁熻
+ *
* @author Administrator
*
*/
@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"),
+ 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;
@@ -42,43 +43,80 @@
return icon;
}
}
-
-
-
-
@Id
- @Field("id")
+ @Field
private String id;
-
- @Field("uid")
+ @Indexed
+ @Field
private Long uid; // 涓婄骇id
-
- @Field("sourceType")
+ @Field
private SourceTypeEnum sourceType; // 鏉ユ簮绫诲瀷
-
- @Field("yearMonth")
+ @Indexed
+ @Field
private String yearMonth; // 缁熻鏃ユ湡-瀛楃涓�
-
- @Field("countDay")
+ @Indexed
+ @Field
private Date countDay; // 缁熻鏃ユ湡
-
- @Field("income")
- private BigDecimal income; // 鏀跺叆-鎴戠殑
-
- @Field("incomeTeam")
- private BigDecimal incomeTeam; // 鏀跺叆-鍥㈤槦-
-
- @Field("orderNum")
+ @Field
+ private Integer income; // 鏀跺叆-鎴戠殑鏀剁泭 X 100
+ @Field
+ private Integer incomeTeam; // 鏀跺叆-鍥㈤槦鏀剁泭 X 100锛堜簩绾у唴锛�
+ @Field
private Integer orderNum; // 璁㈠崟鏁伴噺-鎴戠殑
+ @Field
+ private Integer orderNumTeam; // 璁㈠崟鏁伴噺-鍥㈤槦(浜岀骇鍐�)
+ @Field
+ private Integer teamReward; // 鍥㈤槦濂栧姳 X 100
+ @Field
+ private Integer teamRewardNum; // 鍥㈤槦濂栧姳璁㈠崟鏁伴噺
+ @Field
+ private Integer teamSubsidy; // 鍥㈤槦琛ヨ创 X 100
+ @Field
+ private Integer teamSubsidyNum; // 鍥㈤槦琛ヨ创璁㈠崟鏁伴噺
+ @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;
+ }
+
- @Field("orderNumTeam")
- private Integer orderNumTeam; // 璁㈠崟鏁伴噺-鍥㈤槦
+ public Integer getDirectOrderNum() {
+ return directOrderNum;
+ }
- @Field("updateTime")
+ 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() {
return id;
@@ -96,19 +134,43 @@
this.uid = uid;
}
- public BigDecimal getIncome() {
+ public SourceTypeEnum getSourceType() {
+ return sourceType;
+ }
+
+ public void setSourceType(SourceTypeEnum sourceType) {
+ this.sourceType = sourceType;
+ }
+
+ public String getYearMonth() {
+ return yearMonth;
+ }
+
+ public void setYearMonth(String yearMonth) {
+ this.yearMonth = yearMonth;
+ }
+
+ public Date getCountDay() {
+ return countDay;
+ }
+
+ public void setCountDay(Date countDay) {
+ this.countDay = countDay;
+ }
+
+ public Integer getIncome() {
return income;
}
- public void setIncome(BigDecimal income) {
+ public void setIncome(Integer income) {
this.income = income;
}
- public BigDecimal getIncomeTeam() {
+ public Integer getIncomeTeam() {
return incomeTeam;
}
- public void setIncomeTeam(BigDecimal incomeTeam) {
+ public void setIncomeTeam(Integer incomeTeam) {
this.incomeTeam = incomeTeam;
}
@@ -128,12 +190,36 @@
this.orderNumTeam = orderNumTeam;
}
- public Date getCountDay() {
- return countDay;
+ public Integer getTeamReward() {
+ return teamReward;
}
- public void setCountDay(Date countDay) {
- this.countDay = countDay;
+ public void setTeamReward(Integer teamReward) {
+ this.teamReward = teamReward;
+ }
+
+ public Integer getTeamRewardNum() {
+ return teamRewardNum;
+ }
+
+ public void setTeamRewardNum(Integer teamRewardNum) {
+ this.teamRewardNum = teamRewardNum;
+ }
+
+ public Integer getTeamSubsidy() {
+ return teamSubsidy;
+ }
+
+ public void setTeamSubsidy(Integer teamSubsidy) {
+ this.teamSubsidy = teamSubsidy;
+ }
+
+ public Integer getTeamSubsidyNum() {
+ return teamSubsidyNum;
+ }
+
+ public void setTeamSubsidyNum(Integer teamSubsidyNum) {
+ this.teamSubsidyNum = teamSubsidyNum;
}
public Date getUpdateTime() {
@@ -144,19 +230,4 @@
this.updateTime = updateTime;
}
- public SourceTypeEnum getSourceType() {
- return 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