yujian
2020-05-18 0329b0de336a2664603424a4eec3f33bb8f29446
H5统计bug
1个文件已修改
44 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
            }
        }