From b99a10cff6b4c4d0965871be894fba8ba64605fc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 29 八月 2019 14:15:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java |   79 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 77 insertions(+), 2 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 deda80a..37ed7c5 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,7 +17,10 @@
 
 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.exception.money.UserMoneyDetailException;
 import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
+import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.vo.money.UserMoneyDetailHistoryVO;
 import com.yeshi.fanli.vo.money.UserMonthMoneyVO;
@@ -26,6 +30,13 @@
 
 	@Resource
 	private UserMoneyDetailMapper userMoneyDetailMapper;
+
+	@Override
+	public void addUserMoneyDetail(UserMoneyDetail detail) throws UserMoneyDetailException {
+		if (detail == null || detail.getMoney() == null || detail.getType() == null || detail.getUserInfo() == null)
+			throw new UserMoneyDetailException(1, "淇℃伅涓嶅畬鏁�");
+		userMoneyDetailMapper.insertSelective(detail);
+	}
 
 	@Override
 	public List<UserMoneyDetailHistoryVO> listUserMoneyDetailForClient(Long uid, Long userMoneyDetailId, Date maxTime) {
@@ -39,6 +50,7 @@
 			} else {// 绛涢�変簡鏃堕棿
 				list = userMoneyDetailMapper.selectByMaxCreateTime(uid, maxTime, 20);
 			}
+
 			if (list != null && list.size() > 0) {
 				Calendar calendar = Calendar.getInstance();
 				calendar.setTimeInMillis(list.get(0).getCreateTime().getTime());
@@ -93,7 +105,23 @@
 			list = tempList;
 		}
 
-		if (list != null)
+		if (list != null) {
+			// 閲嶆柊璁剧疆鏍囬
+			for (UserMoneyDetail md : list)
+				resetTitle(md);
+
+			if (userMoneyDetailId != null && list.size() > 0) {
+				UserMoneyDetail umd = userMoneyDetailMapper.selectByPrimaryKey(userMoneyDetailId);
+				if (!TimeUtil.getGernalTime(umd.getCreateTime().getTime(), "yyyy-MM")
+						.equalsIgnoreCase(TimeUtil.getGernalTime(list.get(0).getCreateTime().getTime(), "yyyy-MM"))) {
+					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));
+					finalList.add(vo);
+				}
+
+			}
 			for (int i = 0; i < list.size(); i++) {
 				if (i > 0 && !TimeUtil.getGernalTime(list.get(i - 1).getCreateTime().getTime(), "yyyy-MM")
 						.equalsIgnoreCase(TimeUtil.getGernalTime(list.get(i).getCreateTime().getTime(), "yyyy-MM"))) {// 鏈潯鏁版嵁涓庝笂鏉℃暟鎹笉鏄悓涓�鏈堝垯鎻掑叆鏈堜唤
@@ -107,6 +135,7 @@
 				vo.setDetail(list.get(i));
 				finalList.add(vo);
 			}
+		}
 
 		// 缁熻鏈堣祫閲�
 
@@ -135,12 +164,30 @@
 			keys = monthMap.keySet().iterator();
 			while (keys.hasNext()) {
 				Integer key = keys.next();
-				finalList.get(key).getMonth().setExpend(voList.get(p).getExpend());
+				// 鍘婚櫎鏀嚭璐熷彿
+				finalList.get(key).getMonth().setExpend(voList.get(p).getExpend().replace("-", ""));
 				finalList.get(key).getMonth().setIncome(voList.get(p).getIncome());
 				p++;
 			}
 		}
 		return finalList;
+	}
+
+	private UserMoneyDetail resetTitle(UserMoneyDetail detail) {
+		UserMoneyDetailTypeEnum[] enums = new UserMoneyDetailTypeEnum[] { UserMoneyDetailTypeEnum.fanli,
+				UserMoneyDetailTypeEnum.fanliWeiQuan, UserMoneyDetailTypeEnum.invite,
+				UserMoneyDetailTypeEnum.inviteAndShare, UserMoneyDetailTypeEnum.inviteWeiQuan,
+				UserMoneyDetailTypeEnum.orderReward, UserMoneyDetailTypeEnum.repeatStatistic,
+				UserMoneyDetailTypeEnum.share, UserMoneyDetailTypeEnum.shareWeiQuan, UserMoneyDetailTypeEnum.weiQuan };
+		boolean inType = false;
+		for (UserMoneyDetailTypeEnum e : enums)
+			if (detail.getType() == e) {
+				inType = true;
+				break;
+			}
+		if (inType)
+			detail.setTitle(detail.getTitle() + "銆�" + Constant.getSourceName(detail.getOrderType()) + "銆�");
+		return detail;
 	}
 
 	@Override
@@ -161,4 +208,32 @@
 		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;
+	}
+
+	@Override
+	public UserMoneyDetail selectByTypeAndUidAndIdentifyCode(UserMoneyDetailTypeEnum type, Long uid,
+			Long sourceIdentifyId) {
+		return userMoneyDetailMapper.selectByTypeAndUidAndIdentifyCode(type, uid, sourceIdentifyId);
+	}
+
 }

--
Gitblit v1.8.0