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 | 4 ++--
1 files changed, 2 insertions(+), 2 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 1fad3d4..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
@@ -83,8 +83,8 @@
UserInfo user = userInfoService.selectByPKey(codePublishRecord.getUid());
- long firstTeam = threeSaleSerivce.countFirstTeam(codePublishRecord.getUid(), 1);
- long secondTeam = threeSaleSerivce.countSecondTeam(codePublishRecord.getUid(), 1);
+ 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
--
Gitblit v1.8.0