From ebb3551170b255defc25fe93bbf6eb1e84cd321d Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期四, 29 十一月 2018 17:46:47 +0800
Subject: [PATCH] 清理多余引用
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java | 98 ++++++++++++++++++++++++++-----------------------
1 files changed, 52 insertions(+), 46 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 6ee9728..a885daf 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
@@ -424,96 +424,104 @@
for (ThreeSale threeSale: list) {
JSONObject object = new JSONObject();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ SimpleDateFormat sdf = new SimpleDateFormat("MM.dd HH:mm");
+ SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+ SimpleDateFormat formatYears = new SimpleDateFormat("yyyy");
+ Date todayTime = new Date();
// 閭�璇穒d
object.put("inviteId", threeSale.getId());
+ // 鍔犲叆闃熷垪鏃堕棿
Long createTime = threeSale.getCreateTime();
Date inviteTime = new Date(createTime);
- object.put("inviteTime", sdf.format(inviteTime) + " 鍔犲叆");
+ object.put("inviteTime", format.format(inviteTime) + " 鍔犲叆");
- String nickName = null;
+
+ String memoName = "";
+ ThreeSaleExtraInfo threeSaleExtraInfo = threeSale.getThreeSaleExtraInfo();
+ if (threeSaleExtraInfo != null) {
+ if (!StringUtil.isNullOrEmpty(threeSaleExtraInfo.getNickname())) {
+ memoName = threeSaleExtraInfo.getNickname();
+ }
+ }
+ object.put("memoName", memoName);
+
+ String nickName = "";
+ String portrait = "";
Long lastLoginTime = null;
- String portrait = null;
- Long workerId = null;
UserInfo worker = threeSale.getWorker();
if (worker != null) {
- workerId = worker.getId();
portrait = worker.getPortrait();
lastLoginTime = worker.getLastLoginTime();
nickName = worker.getNickName();
}
-
- object.put("workerId", workerId);
+ object.put("nickName", nickName);
object.put("portrait", portrait);
- int type = 0;
+ int state = 0;
String fontColor1 = "#888888";
String fontColor2 = "#F14242";
JSONArray array = new JSONArray();
if (threeSale.getState()) {
- type = 1;
+ state = 1;
if (lastLoginTime == null) {
lastLoginTime = threeSale.getCreateTime();
}
- JSONArray array1 = new JSONArray();
- array1.add(fontColor1);
- array1.add("鏈�杩戠櫥闄� " + sdf.format(lastLoginTime));
+ JSONObject contentJson = new JSONObject();
+ contentJson.put("color", fontColor1);
- array.add(array1);
+ if (formatYears.format(todayTime).equals(formatYears.format(lastLoginTime))) {
+ // 鏈勾
+ contentJson.put("content", "鏈�杩戠櫥闄� " + sdf.format(lastLoginTime));
+ } else {
+ // 寰�骞�
+ contentJson.put("content", "鏈�杩戠櫥闄� " + format.format(lastLoginTime));
+ }
+
+ array.add(contentJson);
} else if ( threeSale.getExpire()!= null && (threeSale.getExpire() == 1 || threeSale.getExpire().equals(1))) {
- type = 2;
- JSONArray array1 = new JSONArray();
- array1.add(fontColor1);
- array1.add("宸茬粡鑴辩閭�璇峰叧绯�");
-
- array.add(array1);
+ state = 2;
+ JSONObject contentJson = new JSONObject();
+ contentJson.put("color", fontColor1);
+ contentJson.put("content", "宸茬粡鑴辩閭�璇峰叧绯�");
+ array.add(contentJson);
} else {
- type = 0;
+ state = 0;
Calendar c = Calendar.getInstance();
c.setTime(inviteTime);
c.add(Calendar.DAY_OF_MONTH, 60);// 閭�璇蜂笉瓒呰繃60澶�
- Date todayTime = new Date();
+
long days = (c.getTimeInMillis() -todayTime.getTime()) / (1000*3600*24);
if (days < 0) {
days = 0;
}
- JSONArray array1 = new JSONArray();
- array1.add(fontColor1);
- array1.add("灏嗕簬");
+ JSONObject contentJson1 = new JSONObject();
+ contentJson1.put("color", fontColor1);
+ contentJson1.put("content", "灏嗕簬");
- JSONArray array2 = new JSONArray();
- array2.add(fontColor2);
- array2.add(days+"澶� ");
+ JSONObject contentJson2 = new JSONObject();
+ contentJson2.put("color", fontColor2);
+ contentJson2.put("content", days+"澶�");
- JSONArray array3 = new JSONArray();
- array3.add(fontColor1);
- array3.add("鍚庤劚绂婚個璇峰叧绯�");
+ JSONObject contentJson3 = new JSONObject();
+ contentJson3.put("color", fontColor1);
+ contentJson3.put("content", "鍚庤劚绂婚個璇峰叧绯�");
- array.add(array1);
- array.add(array2);
- array.add(array3);
+ array.add(contentJson1);
+ array.add(contentJson2);
+ array.add(contentJson3);
}
- object.put("type", type);
+ object.put("state", state);
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);
}
@@ -522,8 +530,6 @@
result.put("result_list", resultArray);
return result;
-
}
-
}
--
Gitblit v1.8.0