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/dao/order/OrderMoneyDailyCountDao.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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..0a089d3 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
@@ -28,8 +28,7 @@
import com.mongodb.GroupCommand;
import com.yeshi.fanli.dao.MongodbBaseDao;
import com.yeshi.fanli.entity.order.OrderMoneyDailyCount;
-import com.yeshi.fanli.entity.order.OrderMoneyDailyCount.SourceTypeEnum;
-import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.entity.order.SourceTypeEnum;
import com.yeshi.fanli.vo.order.OrderRankingVO;
@Repository
@@ -81,7 +80,7 @@
if (minDay != null)
list.add(Criteria.where("countDay").gte(minDay));
if (maxDay != null)
- list.add(Criteria.where("countDay").lte(maxDay));
+ list.add(Criteria.where("countDay").lt(maxDay));
Query query = new Query();
if (list.size() > 0) {
@@ -113,7 +112,7 @@
if (minDate != null)
list.add(Criteria.where("countDay").gte(minDate));
if (maxDate != null)
- list.add(Criteria.where("countDay").lte(maxDate));
+ list.add(Criteria.where("countDay").lt(maxDate));
Query query = new Query();
if (list.size() > 0) {
@@ -182,7 +181,7 @@
if (minDate != null)
list.add(Criteria.where("countDay").gte(minDate));
if (maxDate != null)
- list.add(Criteria.where("countDay").lte(maxDate));
+ list.add(Criteria.where("countDay").lt(maxDate));
Query query = new Query();
if (list.size() > 0) {
@@ -265,7 +264,7 @@
if (minDate != null)
list.add(Criteria.where("countDay").gte(minDate));
if (maxDate != null)
- list.add(Criteria.where("countDay").lte(maxDate));
+ list.add(Criteria.where("countDay").lt(maxDate));
Query query = new Query();
if (list.size() > 0) {
@@ -335,7 +334,7 @@
if (minDate != null)
list.add(Criteria.where("countDay").gte(minDate));
if (maxDate != null)
- list.add(Criteria.where("countDay").lte(maxDate));
+ list.add(Criteria.where("countDay").lt(maxDate));
Query query = new Query();
if (list.size() > 0) {
@@ -409,7 +408,7 @@
if (minDate != null)
list.add(Criteria.where("countDay").gte(minDate));
if (maxDate != null)
- list.add(Criteria.where("countDay").lte(maxDate));
+ list.add(Criteria.where("countDay").lt(maxDate));
Query query = new Query();
if (list.size() > 0) {
@@ -424,6 +423,7 @@
map.put("totalRewardNum", 0);
map.put("totalSubsidy", 0);
map.put("totalSubsidyNum", 0);
+ map.put("totalNum", 0);
BasicDBObject initial = new BasicDBObject(map);
// 杩涜鎸夊ぉ銆佸懆銆佹湀鍒嗙粍
@@ -455,6 +455,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();
@@ -479,7 +480,7 @@
if (minDate != null)
list.add(Criteria.where("countDay").gte(minDate));
if (maxDate != null)
- list.add(Criteria.where("countDay").lte(maxDate));
+ list.add(Criteria.where("countDay").lt(maxDate));
Query query = new Query();
if (list.size() > 0) {
@@ -553,7 +554,7 @@
if (minDate != null)
list.add(Criteria.where("countDay").gte(minDate));
if (maxDate != null)
- list.add(Criteria.where("countDay").lte(maxDate));
+ list.add(Criteria.where("countDay").lt(maxDate));
Query query = new Query();
if (list.size() > 0) {
@@ -622,7 +623,7 @@
if (minDate != null)
list.add(Criteria.where("countDay").gte(minDate));
if (maxDate != null)
- list.add(Criteria.where("countDay").lte(maxDate));
+ list.add(Criteria.where("countDay").lt(maxDate));
Query query = new Query();
if (list.size() > 0) {
@@ -684,7 +685,7 @@
if (minDate != null)
list.add(Criteria.where("countDay").gte(minDate));
if (maxDate != null)
- list.add(Criteria.where("countDay").lte(maxDate));
+ list.add(Criteria.where("countDay").lt(maxDate));
Query query = new Query();
if (list.size() > 0) {
@@ -747,6 +748,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