From 9666caad786d890ace2df4594e71cee47bb489b9 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期五, 23 十一月 2018 09:22:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 18 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 2c71903..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
@@ -377,6 +377,17 @@
return threeSaleMapper.getMyBoss(uid);
}
+
+ @Override
+ public ThreeSale selectByPrimaryKey(Long id) {
+ return threeSaleMapper.selectByPrimaryKey(id);
+ }
+
+
+ @Override
+ public List<ThreeSale> listbyIdAndBossId(Long id, Long uid, Integer expire) {
+ return threeSaleMapper.listbyIdAndBossId(id, uid, expire);
+ }
@Override
public JSONObject getMyFirstTeam(long start, int count, Long uid) {
@@ -412,18 +423,38 @@
JSONArray resultArray = new JSONArray();
for (ThreeSale threeSale: list) {
-
JSONObject object = new JSONObject();
+ SimpleDateFormat sdf = new SimpleDateFormat("MM.dd HH:mm");
+ SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+ SimpleDateFormat formatYears = new SimpleDateFormat("yyyy");
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ 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) + "鍔犲叆");
- String nickName = null;
+ 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();
+ 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();
@@ -433,7 +464,7 @@
lastLoginTime = worker.getLastLoginTime();
nickName = worker.getNickName();
}
-
+ object.put("nickName", nickName);
object.put("workerId", workerId);
object.put("portrait", portrait);
@@ -450,7 +481,7 @@
JSONArray array1 = new JSONArray();
array1.add(fontColor1);
- array1.add("鏈�杩戠櫥闄�" + sdf.format(lastLoginTime));
+ array1.add("鏈�杩戠櫥闄� " + sdf.format(lastLoginTime));
array.add(array1);
@@ -467,7 +498,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) {
@@ -480,7 +511,7 @@
JSONArray array2 = new JSONArray();
array2.add(fontColor2);
- array2.add(days+"澶� ");
+ array2.add(days+"澶�");
JSONArray array3 = new JSONArray();
array3.add(fontColor1);
@@ -493,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