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/service/impl/redpack/RedPackWinInviteServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
index d58447d..9687b36 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
@@ -103,7 +103,7 @@
return;
// 灏忎簬2.0.5鐗堟湰涓嶅鍔�
- if (!VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
+ if (!VersionUtil.greaterThan_2_0_5("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
activeLog.getVersionCode()))
return;
@@ -142,7 +142,7 @@
return;
// 灏忎簬2.0.2鐗堟湰涓嶅鍔�
- if (!VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
+ if (!VersionUtil.greaterThan_2_0_5("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
activeLog.getVersionCode()))
return;
@@ -430,4 +430,18 @@
return redPackWinInviteMapper.countTeamNumByTid(uid, teamUid);
}
+
+ @Override
+ public List<RedPackWinInvite> query(long page, int count, String key, String type){
+ return redPackWinInviteMapper.query(count * (page - 1), count, key, type);
+ }
+
+ @Override
+ public long count(String key, String type){
+ Long count = redPackWinInviteMapper.count(key, type);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
}
--
Gitblit v1.8.0