From 46906f31ebc49cde75b65d71bb06f228997148dc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 24 十二月 2018 16:52:03 +0800
Subject: [PATCH] 优化资金明细
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java
index ee4d888..14b3d61 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java
@@ -3,6 +3,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.lang.reflect.Type;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -24,6 +25,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.vo.money.UserMoneyDetailHistoryVO;
@@ -72,7 +74,12 @@
if (year != null && month != null) {
date = new Date(TimeUtil.convertToTimeTemp(year + "-" + month, "yyyy-M"));
+ Calendar ca = Calendar.getInstance();
+ ca.setTime(date);
+ ca.add(Calendar.MONTH, 1);
+ date = new Date(ca.getTimeInMillis() - 1);
}
+
List<UserMoneyDetailHistoryVO> list = userMoneyDetailService.listUserMoneyDetailForClient(uid, index, date);
long count = userMoneyDetailService.countUserMoneyDetailForClient(uid, index, date);
GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringBuilder(new GsonBuilder())
@@ -87,7 +94,8 @@
public void write(JsonWriter out, UserMoneyDetailTypeEnum arg1) throws IOException {
out.beginObject();
out.name("portrait").value(arg1.getPicture());
- out.name("helpUrl").value(arg1.getHelpUrl());
+ if (!StringUtil.isNullOrEmpty(arg1.getHelpUrl()))
+ out.name("helpUrl").value(arg1.getHelpUrl());
out.endObject();
}
}).registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
--
Gitblit v1.8.0