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/admin/count/DailyCountOrder.java | 61 ++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/admin/count/DailyCountOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/admin/count/DailyCountOrder.java
index 81ee8f9..38c7b78 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/admin/count/DailyCountOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/admin/count/DailyCountOrder.java
@@ -7,7 +7,7 @@
import org.springframework.data.mongodb.core.mapping.Field;
/**
- * 姣忔棩璁㈠崟缁熻
+ * 姣忔棩璁㈠崟缁熻
*
* @author Administrator
*
@@ -17,27 +17,27 @@
public enum DailyCountOrderEnum {
fanliOrderNum("杩斿埄璁㈠崟鏁伴噺"),
- shareOrderNum("鍒嗕韩璁㈠崟鏁伴噺"),
+ shareOrderNum("鍒嗕韩璁㈠崟鏁伴噺"),
inviteOrderNum("閭�璇疯鍗曟暟閲�"),
-
- channelOrderNum24H("娓犻亾璁㈠崟缁熻鏁伴噺24灏忔椂鍐�"),
- channelOrderNum("娓犻亾璁㈠崟缁熻鏁伴噺"),
+
+ channelOrderNum24H("娓犻亾璁㈠崟缁熻鏁伴噺24灏忔椂鍐�"),
+ channelOrderNum("娓犻亾璁㈠崟缁熻鏁伴噺"),
channelOrderMoney("娓犻亾璁㈠崟缁熻閲戦"),
-
- weiQuanOrderNum("鍞悗璁㈠崟缁熻鏁伴噺"),
+
+ weiQuanOrderNum("鍞悗璁㈠崟缁熻鏁伴噺"),
weiQuanOrderMoney("鍞悗璁㈠崟缁熻閲戦"),
-
+
tbOrderTrackRate("娣樺疂璁㈠崟鏍规嵁鐜�"),
- jdOrderTrackRate("浜笢璁㈠崟鏍规嵁鐜�"),
+ jdOrderTrackRate("浜笢璁㈠崟鏍规嵁鐜�"),
pddOrderTrackRate("鎷煎澶氳鍗曟牴鎹巼"),
-
- lastOrderUntreatedNum("璁㈠崟鎵惧洖鏈鐞嗙粺璁℃暟閲�"),
- lastOrderSucceedNum("璁㈠崟鎵惧洖鎴愬姛缁熻鏁伴噺"),
+
+ lastOrderUntreatedNum("璁㈠崟鎵惧洖鏈鐞嗙粺璁℃暟閲�"),
+ lastOrderSucceedNum("璁㈠崟鎵惧洖鎴愬姛缁熻鏁伴噺"),
lastOrderFailNum("璁㈠崟鎵惧洖澶辫触缁熻鏁伴噺"),
lastOrderSucceedMoney("璁㈠崟鎵惧洖鎴愬姛缁熻閲戦");
private final String desc;
-
+
private DailyCountOrderEnum(String desc) {
this.desc = desc;
}
@@ -64,6 +64,16 @@
// 鏇存柊鏃ユ湡
@Field("updateDate")
private Date updateDate;
+
+ // 璁＄畻姣斾緥
+ @Field("rate")
+ private boolean rate;
+ // 褰撴棩鎬绘暟 -璁＄畻姣斾緥
+ @Field("totalDay")
+ private BigDecimal totalDay;
+ // 褰撴棩鏈夋晥鎬绘暟 -璁＄畻姣斾緥
+ @Field("totalValid")
+ private BigDecimal totalValid;
public String getId() {
return id;
@@ -112,4 +122,29 @@
public void setChannel(String channel) {
this.channel = channel;
}
+
+ public boolean isRate() {
+ return rate;
+ }
+
+ public void setRate(boolean rate) {
+ this.rate = rate;
+ }
+
+ public BigDecimal getTotalDay() {
+ return totalDay;
+ }
+
+ public void setTotalDay(BigDecimal totalDay) {
+ this.totalDay = totalDay;
+ }
+
+ public BigDecimal getTotalValid() {
+ return totalValid;
+ }
+
+ public void setTotalValid(BigDecimal totalValid) {
+ this.totalValid = totalValid;
+ }
+
}
--
Gitblit v1.8.0