From 9f08d10e3129d4baf61b4fbc30833a159c81ba68 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期五, 23 十一月 2018 09:18:33 +0800
Subject: [PATCH] 队员修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
index 46610e3..1320154 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
@@ -443,10 +443,18 @@
object.put("inviteTime", format.format(inviteTime) + " 鍔犲叆");
}
+ String memoName = "";
+ ThreeSaleExtraInfo threeSaleExtraInfo = threeSale.getThreeSaleExtraInfo();
+ if (threeSaleExtraInfo != null) {
+ if (!StringUtil.isNullOrEmpty(threeSaleExtraInfo.getNickname())) {
+ memoName = threeSaleExtraInfo.getNickname();
+ }
+ }
+ object.put("memoName", memoName);
- String nickName = null;
+ String nickName = "";
+ String portrait = "";
Long lastLoginTime = null;
- String portrait = null;
Long workerId = null;
UserInfo worker = threeSale.getWorker();
@@ -456,7 +464,7 @@
lastLoginTime = worker.getLastLoginTime();
nickName = worker.getNickName();
}
-
+ object.put("nickName", nickName);
object.put("workerId", workerId);
object.put("portrait", portrait);
@@ -516,15 +524,6 @@
object.put("type", type);
object.put("recentMsg", array);
-
- ThreeSaleExtraInfo threeSaleExtraInfo = threeSale.getThreeSaleExtraInfo();
- if (threeSaleExtraInfo != null) {
- if (!StringUtil.isNullOrEmpty(threeSaleExtraInfo.getNickname())) {
- nickName = threeSaleExtraInfo.getNickname();
- }
- }
-
- object.put("nickName", nickName);
resultArray.add(object);
}
--
Gitblit v1.8.0