From ed2c519540a927e8b10fd79b96ca8472e89fe47b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 10 一月 2019 15:15:25 +0800
Subject: [PATCH] 修改整个订单的状态
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 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 c139422..11a15a1 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;
@@ -93,7 +95,19 @@
list = tempList;
}
- if (list != null)
+ if (list != null) {
+ 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 +121,7 @@
vo.setDetail(list.get(i));
finalList.add(vo);
}
+ }
// 缁熻鏈堣祫閲�
@@ -135,7 +150,8 @@
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++;
}
@@ -171,4 +187,16 @@
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