From 8ce2aa79bb38cf83849e769d77fa223bc1ad805e Mon Sep 17 00:00:00 2001
From: 喻健 <喻健 @Admin>
Date: 星期四, 22 十一月 2018 16:33:21 +0800
Subject: [PATCH] 队员细节优化
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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..46610e3 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,14 +424,25 @@
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) + " 鍔犲叆");
+
+ if (formatYears.format(todayTime).equals(formatYears.format(inviteTime))) {
+ // 鏈勾
+ object.put("inviteTime", sdf.format(inviteTime) + " 鍔犲叆");
+ } else {
+ // 寰�骞�
+ object.put("inviteTime", format.format(inviteTime) + " 鍔犲叆");
+ }
+
String nickName = null;
Long lastLoginTime = null;
@@ -479,7 +490,7 @@
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) {
@@ -492,7 +503,7 @@
JSONArray array2 = new JSONArray();
array2.add(fontColor2);
- array2.add(days+"澶� ");
+ array2.add(days+"澶�");
JSONArray array3 = new JSONArray();
array3.add(fontColor1);
--
Gitblit v1.8.0