From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单
---
fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 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 e4596ce..e8c4f7e 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
@@ -90,7 +90,7 @@
public List<TeamFansInfo> query(int start, int count, int type, Long uid, ThreeSaleFocusDTO focusDTO) {
Query query = createQuery(type, uid, focusDTO);
query.skip(start).limit(count);
- query.with(new Sort(Sort.Direction.DESC, "weight"));
+ query.with(new Sort(Sort.Direction.DESC, "joinTime"));
return findList(query);
}
@@ -153,7 +153,7 @@
if (!StringUtil.isNullOrEmpty(focusDTO.getMinActiveTime())) {
Date date = TimeUtil.parseDotYYYYMMDD(focusDTO.getMinActiveTime());
- list.add(Criteria.where("joinTime").gte(date));
+ list.add(Criteria.where("activeTime").gte(date));
}
if (!StringUtil.isNullOrEmpty(focusDTO.getMaxActiveTime())) {
@@ -213,4 +213,34 @@
return query;
}
+
+ /**
+ * 鏍规嵁鐢ㄦ埛淇℃伅鍖归厤
+ * @param key
+ * @return
+ */
+ public List<TeamFansInfo> queryByUserInfo(String key) {
+ if (StringUtil.isNullOrEmpty(key))
+ return null;
+
+ Long workerId = null;
+ try {
+ workerId = Long.parseLong(key);
+ } catch (Exception e) {
+ }
+
+ Criteria criteria = null;
+ if (workerId == null) {
+ criteria = new Criteria().orOperator(Criteria.where("phone").is(key),
+ new Criteria().orOperator(Criteria.where("inviteCode").is(key)));
+ } else {
+ criteria = new Criteria().orOperator(Criteria.where("phone").is(key),
+ new Criteria().orOperator(Criteria.where("inviteCode").is(key)),
+ new Criteria().orOperator(Criteria.where("workerId").is(workerId)));
+ }
+
+ Query query = new Query(criteria);
+ return findList(query);
+ }
+
}
--
Gitblit v1.8.0