From afe0ef2ba0692e9c00765b6f8e618f4a53bbd5a7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 10:02:01 +0800
Subject: [PATCH] 本月未到账修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java
index 78527e2..066855e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java
@@ -265,13 +265,15 @@
Calendar ca = Calendar.getInstance();
ca.setTime(new Date(timeStamp));
ca.add(Calendar.MONTH, 1);
- maxDate = new Date(ca.getTimeInMillis());
+ maxDate = new Date(
+ TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(ca.getTimeInMillis(), "yyyy-MM"), "yyyy-MM"));
// 鏈湀鏈埌璐�
vo.setMonthUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithPreGetTime(uid, minDate, maxDate));
// 鍏ㄩ儴鏈埌璐�
minDate = new Date(0);
+ maxDate=new Date(timeStamp);
vo.setTotalUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithCreateTime(uid, minDate, maxDate));
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {
--
Gitblit v1.8.0