From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java b/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java
index ffafaaf..0296a5a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.dao.user.invite;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -15,6 +16,7 @@
import com.yeshi.fanli.dto.user.ThreeSaleFocusDTO;
import com.yeshi.fanli.entity.bus.user.TeamFansInfo;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
@Repository
public class TeamFansInfoDao extends MongodbBaseDao<TeamFansInfo> {
@@ -37,10 +39,10 @@
update.set("stateValid", record.getStateValid());
if (record.getTaobaoBind() != null)
update.set("taobaoBind", record.getTaobaoBind());
- if (record.getWeixinBind() != null)
- update.set("weixinBind", record.getWeixinBind());
if (record.getWeixinId() != null)
update.set("weixinId", record.getWeixinId());
+ if (record.getWeixinIdExist() != null)
+ update.set("weixinIdExist", record.getWeixinIdExist());
if (record.getPhone() != null)
update.set("phone", record.getPhone());
if (record.getPhoneOpen() != null)
@@ -103,9 +105,7 @@
}
private Query createQuery(int type, Long uid, ThreeSaleFocusDTO focusDTO) {
- Query query = new Query();
List<Criteria> list = new ArrayList<Criteria>();
-
if (type == 1) {
list.add(Criteria.where("bossId").is(uid));
} else {
@@ -120,7 +120,7 @@
list.add(Criteria.where("taobaoBind").is(focusDTO.getTaobaoBind()));
if (focusDTO.getWeixinBind() != null)
- list.add(Criteria.where("weixinBind").is(focusDTO.getWeixinBind()));
+ list.add(Criteria.where("weixinIdExist").is(focusDTO.getWeixinBind()));
if (!StringUtil.isNullOrEmpty(focusDTO.getLevel()))
list.add(Criteria.where("level").is(focusDTO.getLevel()));
@@ -131,23 +131,35 @@
if (focusDTO.getMaxFansNum() != null)
list.add(Criteria.where("fansNum").lte(focusDTO.getMaxFansNum()));
- if (!StringUtil.isNullOrEmpty(focusDTO.getMinJoinTime()))
- list.add(Criteria.where("joinTime").gte(focusDTO.getMinJoinTime()));
+ if (focusDTO.getMinIncome() != null) {
+ int income = focusDTO.getMinIncome().multiply(BigDecimal.valueOf(100)).setScale(2, BigDecimal.ROUND_DOWN).intValue();
+ list.add(Criteria.where("income").gte(income));
+ }
- if (!StringUtil.isNullOrEmpty(focusDTO.getMaxJoinTime()))
- list.add(Criteria.where("joinTime").lte(focusDTO.getMaxJoinTime()));
+ if (focusDTO.getMaxIncome() != null) {
+ int income = focusDTO.getMaxIncome().multiply(BigDecimal.valueOf(100)).setScale(2, BigDecimal.ROUND_DOWN).intValue();
+ list.add(Criteria.where("income").lte(income));
+ }
+
+ if (!StringUtil.isNullOrEmpty(focusDTO.getMinJoinTime())) {
+ Date date = TimeUtil.parseDotYYYYMMDD(focusDTO.getMinJoinTime());
+ list.add(Criteria.where("joinTime").gte(date));
+ }
- if (!StringUtil.isNullOrEmpty(focusDTO.getMinActiveTime()))
- list.add(Criteria.where("activeTime").gte(focusDTO.getMinActiveTime()));
+ if (!StringUtil.isNullOrEmpty(focusDTO.getMaxJoinTime())) {
+ Date date = TimeUtil.parseDotCommon(focusDTO.getMaxJoinTime() + " 23:59:59");
+ list.add(Criteria.where("joinTime").lte(date));
+ }
+
+ if (!StringUtil.isNullOrEmpty(focusDTO.getMinActiveTime())) {
+ Date date = TimeUtil.parseDotYYYYMMDD(focusDTO.getMinActiveTime());
+ list.add(Criteria.where("activeTime").gte(date));
+ }
- if (!StringUtil.isNullOrEmpty(focusDTO.getMaxActiveTime()))
- list.add(Criteria.where("activeTime").lte(focusDTO.getMaxActiveTime()));
-
- if (focusDTO.getMinIncome() != null)
- list.add(Criteria.where("income").gte(focusDTO.getMinIncome()));
-
- if (focusDTO.getMaxIncome() != null)
- list.add(Criteria.where("income").lte(focusDTO.getMaxIncome()));
+ if (!StringUtil.isNullOrEmpty(focusDTO.getMaxActiveTime())) {
+ Date date = TimeUtil.parseDotCommon(focusDTO.getMaxActiveTime() + " 23:59:59");
+ list.add(Criteria.where("activeTime").lte(date));
+ }
if (!StringUtil.isNullOrEmpty(focusDTO.getKey())) {
if (type == 1) {
@@ -190,6 +202,7 @@
}
}
+ Query query = new Query();
if (list.size() > 0) {
Criteria[] cas = new Criteria[list.size()];
for (int i = 0; i < list.size(); i++)
--
Gitblit v1.8.0