From 5647d090f7b83f406abfc390294162bbc6d68fcb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 14:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java b/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java
index 85d821e..8ff1d39 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java
@@ -180,9 +180,9 @@
private String getTeamNumReduce() {
StringBuilder builder = new StringBuilder();
builder.append("function(doc, aggr){ ");
- builder.append(" aggr.directOrderNum += doc.firstNum;");
- builder.append(" aggr.inDirectOrderNum += doc.secondNum;");
- builder.append(" aggr.beyondOrderNum += doc.beyondNum;");
+ builder.append(" if(doc.firstNum > 0){ aggr.firstTotal += doc.firstNum;}");
+ builder.append(" aggr.secondTotal += doc.secondNum;");
+ builder.append(" aggr.beyondTotal += doc.beyondNum;");
builder.append(" }");
return builder.toString();
}
@@ -213,9 +213,9 @@
}
Map<String, Object> map = new HashMap<>();
- map.put("directOrderNum", 0);
- map.put("inDirectOrderNum", 0);
- map.put("beyondOrderNum", 0);
+ map.put("firstTotal", 0);
+ map.put("secondTotal", 0);
+ map.put("beyondTotal", 0);
BasicDBObject initial = new BasicDBObject(map);
// 杩涜鎸夊ぉ銆佸懆銆佹湀鍒嗙粍
@@ -243,9 +243,10 @@
Date dtime = sdf.parse(date);
TeamDailyRecord dailyCount = new TeamDailyRecord();
dailyCount.setCountDay(dtime);
- dailyCount.setFirstNum(new BigDecimal(dbObject.get("directOrderNum").toString()).intValue());
- dailyCount.setSecondNum(new BigDecimal(dbObject.get("inDirectOrderNum").toString()).intValue());
- dailyCount.setBeyondNum(new BigDecimal(dbObject.get("beyondOrderNum").toString()).intValue());
+ dailyCount.setFirstNum(new BigDecimal(dbObject.get("firstTotal").toString()).intValue());
+ dailyCount.setSecondNum(new BigDecimal(dbObject.get("secondTotal").toString()).intValue());
+ dailyCount.setBeyondNum(new BigDecimal(dbObject.get("beyondTotal").toString()).intValue());
+
results.add(dailyCount);
} catch (Exception e) {
e.printStackTrace();
@@ -281,9 +282,9 @@
}
Map<String, Object> map = new HashMap<>();
- map.put("directOrderNum", 0);
- map.put("inDirectOrderNum", 0);
- map.put("beyondOrderNum", 0);
+ map.put("firstTotal", 0);
+ map.put("secondTotal", 0);
+ map.put("beyondTotal", 0);
BasicDBObject initial = new BasicDBObject(map);
// 杩涜鎸夊ぉ銆佸懆銆佹湀鍒嗙粍
@@ -307,9 +308,9 @@
TeamDailyRecord dailyCount = new TeamDailyRecord();
dailyCount.setYearMonth(object.toString());
- dailyCount.setFirstNum(new BigDecimal(dbObject.get("directOrderNum").toString()).intValue());
- dailyCount.setSecondNum(new BigDecimal(dbObject.get("inDirectOrderNum").toString()).intValue());
- dailyCount.setBeyondNum(new BigDecimal(dbObject.get("beyondOrderNum").toString()).intValue());
+ dailyCount.setFirstNum(new BigDecimal(dbObject.get("firstTotal").toString()).intValue());
+ dailyCount.setSecondNum(new BigDecimal(dbObject.get("secondTotal").toString()).intValue());
+ dailyCount.setBeyondNum(new BigDecimal(dbObject.get("beyondTotal").toString()).intValue());
results.add(dailyCount);
}
@@ -342,9 +343,9 @@
}
Map<String, Object> map = new HashMap<>();
- map.put("directOrderNum", 0);
- map.put("inDirectOrderNum", 0);
- map.put("beyondOrderNum", 0);
+ map.put("firstTotal", 0);
+ map.put("secondTotal", 0);
+ map.put("beyondTotal", 0);
BasicDBObject initial = new BasicDBObject(map);
// 杩涜鎸夊ぉ銆佸懆銆佹湀鍒嗙粍
@@ -367,10 +368,9 @@
}
TeamDailyRecord dailyCount = new TeamDailyRecord();
- dailyCount.setFirstNum(new BigDecimal(dbObject.get("directOrderNum").toString()).intValue());
- dailyCount.setSecondNum(new BigDecimal(dbObject.get("inDirectOrderNum").toString()).intValue());
- dailyCount.setBeyondNum(new BigDecimal(dbObject.get("beyondOrderNum").toString()).intValue());
-
+ dailyCount.setFirstNum(new BigDecimal(dbObject.get("firstTotal").toString()).intValue());
+ dailyCount.setSecondNum(new BigDecimal(dbObject.get("secondTotal").toString()).intValue());
+ dailyCount.setBeyondNum(new BigDecimal(dbObject.get("beyondTotal").toString()).intValue());
results.add(dailyCount);
}
}
--
Gitblit v1.8.0