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/user/integral/CodePublishRecordServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 e77faad..1bb15ae 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;
@@ -82,14 +82,14 @@
codePublishRecord.setNickName(nickName);
UserInfo user = userInfoService.selectByPKey(codePublishRecord.getUid());
+
+ long firstTeam = threeSaleSerivce.countFirstTeam(codePublishRecord.getUid());
+ long secondTeam = threeSaleSerivce.countSecondTeam(codePublishRecord.getUid());
+ codePublishRecord.setTeam(firstTeam + secondTeam);
if (user != null && user.getType() == 1) {// 鍋囩敤鎴�
long s = Integer
- .parseInt((206 * (6365705L - codePublishRecord.getUid()) / (6365705L - 6315822L) + 82) + "");
- codePublishRecord.setTeam(s);
- } else {// 鐪熺敤鎴�
- long firstTeam = threeSaleSerivce.countFirstTeam(codePublishRecord.getUid(), 1);
- long secondTeam = threeSaleSerivce.countSecondTeam(codePublishRecord.getUid(), 1);
- codePublishRecord.setTeam(firstTeam + secondTeam);
+ .parseInt((180 * (6365705L - codePublishRecord.getUid()) / (6365705L - 6315822L) + 20) + "");
+ codePublishRecord.setTeam(s + codePublishRecord.getTeam());
}
}
--
Gitblit v1.8.0