From edf1645230abeb256e4455a5874ec0cb6e3d9962 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期一, 26 十一月 2018 17:45:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 1320154..70b6eaf 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
@@ -432,16 +432,11 @@
// 閭�璇穒d
object.put("inviteId", threeSale.getId());
+ // 鍔犲叆闃熷垪鏃堕棿
Long createTime = threeSale.getCreateTime();
Date inviteTime = new Date(createTime);
+ object.put("inviteTime", format.format(inviteTime) + " 鍔犲叆");
- if (formatYears.format(todayTime).equals(formatYears.format(inviteTime))) {
- // 鏈勾
- object.put("inviteTime", sdf.format(inviteTime) + " 鍔犲叆");
- } else {
- // 寰�骞�
- object.put("inviteTime", format.format(inviteTime) + " 鍔犲叆");
- }
String memoName = "";
ThreeSaleExtraInfo threeSaleExtraInfo = threeSale.getThreeSaleExtraInfo();
@@ -465,7 +460,6 @@
nickName = worker.getNickName();
}
object.put("nickName", nickName);
- object.put("workerId", workerId);
object.put("portrait", portrait);
int type = 0;
@@ -481,7 +475,14 @@
JSONArray array1 = new JSONArray();
array1.add(fontColor1);
- array1.add("鏈�杩戠櫥闄� " + sdf.format(lastLoginTime));
+
+ if (formatYears.format(todayTime).equals(formatYears.format(lastLoginTime))) {
+ // 鏈勾
+ array1.add("鏈�杩戠櫥闄� " + sdf.format(lastLoginTime));
+ } else {
+ // 寰�骞�
+ array1.add("鏈�杩戠櫥闄� " + format.format(lastLoginTime));
+ }
array.add(array1);
@@ -532,8 +533,6 @@
result.put("result_list", resultArray);
return result;
-
}
-
}
--
Gitblit v1.8.0