From 9d6cbe54651bd3951036e611eabd47a713c91a86 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 五月 2020 12:34:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/order/OrderMoneyDailyCountDao.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/order/OrderMoneyDailyCountDao.java b/fanli/src/main/java/com/yeshi/fanli/dao/order/OrderMoneyDailyCountDao.java
index 7577d90..9bfbc64 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/order/OrderMoneyDailyCountDao.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/order/OrderMoneyDailyCountDao.java
@@ -424,6 +424,7 @@
map.put("totalRewardNum", 0);
map.put("totalSubsidy", 0);
map.put("totalSubsidyNum", 0);
+ map.put("totalNum", 0);
BasicDBObject initial = new BasicDBObject(map);
// 杩涜鎸夊ぉ銆佸懆銆佹湀鍒嗙粍
@@ -455,6 +456,7 @@
dailyCount.setTeamRewardNum(new BigDecimal(dbObject.get("totalRewardNum").toString()).intValue());
dailyCount.setTeamSubsidy(new BigDecimal(dbObject.get("totalSubsidy").toString()).intValue());
dailyCount.setTeamSubsidyNum(new BigDecimal(dbObject.get("totalSubsidyNum").toString()).intValue());
+ dailyCount.setTeamDividentsOrderNum(new BigDecimal(dbObject.get("totalNum").toString()).intValue());
results.add(dailyCount);
} catch (ParseException e) {
e.printStackTrace();
@@ -747,6 +749,7 @@
// 鏌ヨ鏉′欢
List<Criteria> list = new ArrayList<Criteria>();
list.add(Criteria.where("bossUid").is(uid));
+ list.add(Criteria.where("orders.orderNum").gt(0));
if (minDate != null) {
minDate = DateUtil.reduceDay(minDate, 1);
list.add(Criteria.where("orders.countDay").gt(minDate));
--
Gitblit v1.8.0