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 | 72 +++++++++++++++++-------------------
1 files changed, 34 insertions(+), 38 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..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
@@ -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();
@@ -455,45 +450,48 @@
String nickName = "";
String portrait = "";
Long lastLoginTime = 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("nickName", nickName);
- object.put("workerId", workerId);
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);
@@ -505,24 +503,24 @@
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);
resultArray.add(object);
@@ -532,8 +530,6 @@
result.put("result_list", resultArray);
return result;
-
}
-
}
--
Gitblit v1.8.0