From e3dabfd944d4a4c77cd7ec309d7c99e7d05077fc Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期三, 28 十一月 2018 18:21:12 +0800
Subject: [PATCH] 增加提现结果通知短信
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 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 46610e3..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,21 +432,24 @@
// 閭�璇穒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();
+ if (threeSaleExtraInfo != null) {
+ if (!StringUtil.isNullOrEmpty(threeSaleExtraInfo.getNickname())) {
+ memoName = threeSaleExtraInfo.getNickname();
+ }
}
+ object.put("memoName", memoName);
-
- String nickName = null;
+ String nickName = "";
+ String portrait = "";
Long lastLoginTime = null;
- String portrait = null;
Long workerId = null;
UserInfo worker = threeSale.getWorker();
@@ -456,8 +459,7 @@
lastLoginTime = worker.getLastLoginTime();
nickName = worker.getNickName();
}
-
- object.put("workerId", workerId);
+ object.put("nickName", nickName);
object.put("portrait", portrait);
int type = 0;
@@ -473,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);
@@ -517,15 +526,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);
}
@@ -533,8 +533,6 @@
result.put("result_list", resultArray);
return result;
-
}
-
}
--
Gitblit v1.8.0