From 1d9eef9a4ba7caebf73b483e0062f9259dbf22a0 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期五, 28 二月 2020 15:42:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/CodePublishRecordServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/CodePublishRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/CodePublishRecordServiceImpl.java
index 9d2fb53..1fad3d4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/CodePublishRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/CodePublishRecordServiceImpl.java
@@ -46,9 +46,9 @@
}
@Override
- public List<CodePublishRecord> listValid(long start, int count) {
+ public List<CodePublishRecord> listValid(Long uid, long start, int count) {
- List<CodePublishRecord> listValid = codePublishRecordMapper.listValid(start, count,
+ List<CodePublishRecord> listValid = codePublishRecordMapper.listValid(uid, start, count,
CodePublishRecord.VALIDTIME);
if (listValid == null || listValid.size() == 0) {
return listValid;
@@ -88,7 +88,7 @@
codePublishRecord.setTeam(firstTeam + secondTeam);
if (user != null && user.getType() == 1) {// 鍋囩敤鎴�
long s = Integer
- .parseInt((206 * (6365705L - codePublishRecord.getUid()) / (6365705L - 6315822L) + 82) + "");
+ .parseInt((180 * (6365705L - codePublishRecord.getUid()) / (6365705L - 6315822L) + 20) + "");
codePublishRecord.setTeam(s + codePublishRecord.getTeam());
}
}
--
Gitblit v1.8.0