From 117bb1c6a02d99546dd4bf953aeec67b1ab3d94e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 29 十二月 2018 14:52:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java
index c8c730c..66d82c5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.user;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -16,6 +17,7 @@
import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
+import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.vo.money.UserMoneyDetailHistoryVO;
@@ -43,9 +45,20 @@
Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(list.get(0).getCreateTime().getTime());
UserMoneyDetailHistoryVO vo = new UserMoneyDetailHistoryVO();
- vo.setMonth(new UserMonthMoneyVO(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH)+1));
+ vo.setMonth(new UserMonthMoneyVO(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH) + 1));
finalList.add(vo);
+ } else {
+ if (maxTime != null) {//
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTimeInMillis(maxTime.getTime());
+ UserMoneyDetailHistoryVO vo = new UserMoneyDetailHistoryVO();
+ vo.setMonth(new UserMonthMoneyVO(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH) + 1));
+ vo.getMonth().setExpend("0");
+ vo.getMonth().setIncome("0");
+ finalList.add(vo);
+ }
}
+
} else {// 浜屾璇锋眰
int size = 21;
@@ -89,7 +102,7 @@
Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(list.get(i).getCreateTime().getTime());
UserMoneyDetailHistoryVO vo = new UserMoneyDetailHistoryVO();
- vo.setMonth(new UserMonthMoneyVO(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH)+1));
+ vo.setMonth(new UserMonthMoneyVO(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH) + 1));
finalList.add(vo);
}
UserMoneyDetailHistoryVO vo = new UserMoneyDetailHistoryVO();
@@ -100,11 +113,11 @@
// 缁熻鏈堣祫閲�
Map<Integer, UserMoneyDetailHistoryVO> monthMap = new TreeMap<>();
- if(finalList.size()>1)
- for (int i = 0; i < finalList.size(); i++) {
- if (finalList.get(i).getMonth() != null)
- monthMap.put(i, finalList.get(i));
- }
+ if (finalList.size() > 1)
+ for (int i = 0; i < finalList.size(); i++) {
+ if (finalList.get(i).getMonth() != null)
+ monthMap.put(i, finalList.get(i));
+ }
if (!monthMap.isEmpty()) {
List<String> dateFormat = new ArrayList<>();
@@ -150,4 +163,26 @@
return monthCount + detailCount;
}
+ @Override
+ public List<UserMoneyDetail> listByUidWithState(Long uid, int page, int pageSize) {
+ return userMoneyDetailMapper.selectByUidWithState(uid, (page - 1) * pageSize, pageSize);
+ }
+
+ @Override
+ public long countByUidWithState(Long uid) {
+ return userMoneyDetailMapper.selectCountByUidWithState(uid);
+ }
+
+ @Override
+ public BigDecimal statisticUserTypeMoneyWithDate(Long uid, List<UserMoneyDetailTypeEnum> typeList, Date minDate,
+ Date maxDate) {
+ List<String> list = new ArrayList<>();
+ if (typeList != null)
+ for (UserMoneyDetailTypeEnum type : typeList) {
+ list.add(type.name());
+ }
+ BigDecimal money = userMoneyDetailMapper.getTotalMoneyByTypeAndUidWithDate(uid, list, minDate, maxDate);
+ return money == null ? new BigDecimal(0) : money;
+ }
+
}
--
Gitblit v1.8.0