From a79be5c75d4409bd14a36b648c1a398b409cad65 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 08 一月 2019 16:48:39 +0800
Subject: [PATCH] Merge branch 'div1'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
index b14d048..41ba07e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
@@ -1321,7 +1321,7 @@
for (int j = 0; j < list.size(); j++) {
Map<String, Object> map = list.get(j);
- Object createDate = map.get("createDate");
+ Object createDate = map.get("showDate");
String month = createDate.toString();
if (plusDay.equalsIgnoreCase(month)) {
payMoney = map.get("payMoney");
@@ -1350,7 +1350,7 @@
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd");
Date parseDate = sdf.parse(plusDay.toString());
- mapObject.put("createDate", sdf2.format(parseDate));
+ mapObject.put("showDate", sdf2.format(parseDate));
listObject.add(mapObject);
@@ -1375,7 +1375,7 @@
for (int j = 0; j < list.size(); j++) {
Map<String, Object> map = list.get(j);
- Object createDate = map.get("createDate");
+ Object createDate = map.get("showDate");
String month = createDate.toString();
if ((i+"").equalsIgnoreCase(month) || i == Integer.parseInt(month)) {
payMoney = map.get("payMoney");
@@ -1400,7 +1400,7 @@
}
mapObject.put("commision", commision);
- mapObject.put("createDate", i + "鏈�");
+ mapObject.put("showDate", i + "鏈�");
listObject.add(mapObject);
}
--
Gitblit v1.8.0