From 0e0eb2b6645d02c0a0a15cb83fc2717875ab12b4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 24 三月 2020 15:19:39 +0800
Subject: [PATCH] APP更新整改,团队补贴与团队奖励修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/CodePublishRecordServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 19 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 f8134bf..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
@@ -8,7 +8,9 @@
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.mybatis.integral.CodePublishRecordMapper;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.integral.CodePublishRecord;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.integral.CodePublishRecordService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.util.StringUtil;
@@ -18,15 +20,18 @@
@Resource
private CodePublishRecordMapper codePublishRecordMapper;
-
+
@Resource
private ThreeSaleSerivce threeSaleSerivce;
+
+ @Resource
+ private UserInfoService userInfoService;
@Override
public CodePublishRecord selectByPrimaryKey(Long id) {
return codePublishRecordMapper.selectByPrimaryKey(id);
}
-
+
@Override
public void publishInviteCode(Long uid) {
CodePublishRecord codePublishRecord = new CodePublishRecord();
@@ -34,22 +39,22 @@
codePublishRecord.setCreateTime(new Date());
codePublishRecordMapper.insertSelective(codePublishRecord);
}
-
+
@Override
- public long countValidRecord(Long uid){
+ public long countValidRecord(Long uid) {
return codePublishRecordMapper.countValidRecord(uid, CodePublishRecord.VALIDTIME);
}
-
-
+
@Override
- public List<CodePublishRecord> listValid(long start, int count) {
-
- List<CodePublishRecord> listValid = codePublishRecordMapper.listValid(start, count, CodePublishRecord.VALIDTIME);
+ public List<CodePublishRecord> listValid(Long uid, long start, int count) {
+
+ List<CodePublishRecord> listValid = codePublishRecordMapper.listValid(uid, start, count,
+ CodePublishRecord.VALIDTIME);
if (listValid == null || listValid.size() == 0) {
return listValid;
}
-
- for (int i = 0; i < listValid.size(); i ++) {
+
+ for (int i = 0; i < listValid.size(); i++) {
CodePublishRecord codePublishRecord = listValid.get(i);
String inviteCode = codePublishRecord.getInviteCode();
if (StringUtil.isNullOrEmpty(inviteCode)) {
@@ -57,13 +62,13 @@
i--;
continue;
}
-
+
String index = inviteCode.substring(0, 1);
- String end = inviteCode.substring(inviteCode.length()-1, inviteCode.length());
+ String end = inviteCode.substring(inviteCode.length() - 1, inviteCode.length());
codePublishRecord.setInviteCode("TA鐨勯個璇风爜锛�" + index + "****" + end);
-
+
String nickName = codePublishRecord.getNickName();
- if(StringUtil.isNullOrEmpty(nickName)) {
+ if (StringUtil.isNullOrEmpty(nickName)) {
nickName = "K****6";
} else if (nickName.length() == 1) {
// 涓�涓瓧
@@ -71,24 +76,34 @@
} else {
// 涓や釜瀛楀強鍏朵互涓�
String index2 = nickName.substring(0, 1);
- String end2 = nickName.substring(nickName.length()-1, nickName.length());
+ String end2 = nickName.substring(nickName.length() - 1, nickName.length());
nickName = index2 + "****" + end2;
}
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((180 * (6365705L - codePublishRecord.getUid()) / (6365705L - 6315822L) + 20) + "");
+ codePublishRecord.setTeam(s + codePublishRecord.getTeam());
+ }
}
-
+
return listValid;
}
+ @Override
+ public List<CodePublishRecord> listByMinTime(long start, int count, Date minTime) {
+ return codePublishRecordMapper.listByMinTime(start, count, minTime);
+ }
@Override
public long countValid() {
return codePublishRecordMapper.countValid(CodePublishRecord.VALIDTIME);
}
-
}
--
Gitblit v1.8.0