From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/CodePublishRecordServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/CodePublishRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/CodePublishRecordServiceImpl.java
index fc2fd27..da733f8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/CodePublishRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/CodePublishRecordServiceImpl.java
@@ -49,8 +49,15 @@
return listValid;
}
- for (CodePublishRecord codePublishRecord: listValid) {
+ for (int i = 0; i < listValid.size(); i ++) {
+ CodePublishRecord codePublishRecord = listValid.get(i);
String inviteCode = codePublishRecord.getInviteCode();
+ if (StringUtil.isNullOrEmpty(inviteCode)) {
+ listValid.remove(i);
+ i--;
+ continue;
+ }
+
String index = inviteCode.substring(0, 1);
String end = inviteCode.substring(inviteCode.length()-2, inviteCode.length()-1);
codePublishRecord.setInviteCode("TA鐨勯個璇风爜锛�" + index + "****" + end);
@@ -72,7 +79,7 @@
long firstTeam = threeSaleSerivce.countFirstTeam(codePublishRecord.getUid(), 1);
long secondTeam = threeSaleSerivce.countSecondTeam(codePublishRecord.getUid(), 1);
- codePublishRecord.setTeam("鍏辨湁" + (firstTeam + secondTeam) + "涓槦鍛�");
+ codePublishRecord.setTeam(firstTeam + secondTeam);
}
return listValid;
--
Gitblit v1.8.0