From 32f8ab2806fb088335e24983477f5179064ada9d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 29 十一月 2019 17:37:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/CodePublishRecordServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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..9d2fb53 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
@@ -82,14 +82,14 @@
codePublishRecord.setNickName(nickName);
UserInfo user = userInfoService.selectByPKey(codePublishRecord.getUid());
+
+ long firstTeam = threeSaleSerivce.countFirstTeam(codePublishRecord.getUid(), 1);
+ long secondTeam = threeSaleSerivce.countSecondTeam(codePublishRecord.getUid(), 1);
+ 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);
+ codePublishRecord.setTeam(s + codePublishRecord.getTeam());
}
}
--
Gitblit v1.8.0