From 8a67a0754093b8c035951d1c4eea5b6aea583b4c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 29 四月 2020 15:49:20 +0800
Subject: [PATCH] 资金统计数据bug

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 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 d0791f2..1c89658 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
@@ -189,8 +189,11 @@
 		// 涓婃湀鎻愮幇
 		typeList.clear();
 		typeList.add(UserMoneyDetailTypeEnum.extract);
+		typeList.add(UserMoneyDetailTypeEnum.extractNew);
 		typeList.add(UserMoneyDetailTypeEnum.extractVerify);
+		typeList.add(UserMoneyDetailTypeEnum.extractVerifyNew);
 		typeList.add(UserMoneyDetailTypeEnum.extractReject);
+		typeList.add(UserMoneyDetailTypeEnum.extractAutoWX);
 		long timeStamp = System.currentTimeMillis();
 		Calendar calendar = Calendar.getInstance();
 		calendar.setTimeInMillis(timeStamp);
@@ -210,8 +213,11 @@
 		calendar.add(Calendar.MONTH, -1);
 		typeList.clear();
 		typeList.add(UserMoneyDetailTypeEnum.extract);
+		typeList.add(UserMoneyDetailTypeEnum.extractNew);
 		typeList.add(UserMoneyDetailTypeEnum.extractVerify);
+		typeList.add(UserMoneyDetailTypeEnum.extractVerifyNew);
 		typeList.add(UserMoneyDetailTypeEnum.extractReject);
+		typeList.add(UserMoneyDetailTypeEnum.extractAutoWX);
 		vo.setMonthExtractMoney(
 				userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate, 1).abs());
 
@@ -219,12 +225,16 @@
 			// 涓婃湀鏀跺叆
 			typeList.clear();
 			typeList.add(UserMoneyDetailTypeEnum.fanli);
+			typeList.add(UserMoneyDetailTypeEnum.fanliNew);
 			typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);
+			typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuanNew);
 			typeList.add(UserMoneyDetailTypeEnum.share);
+			typeList.add(UserMoneyDetailTypeEnum.shareNew);
 			typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);
 			typeList.add(UserMoneyDetailTypeEnum.invite);
 			typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);
 			typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);
+			typeList.add(UserMoneyDetailTypeEnum.teamReward);
 			typeList.add(UserMoneyDetailTypeEnum.weiQuan);
 			typeList.add(UserMoneyDetailTypeEnum.hongbao);
 			typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);
@@ -241,12 +251,16 @@
 			// 鏈湀鍒拌处
 			typeList.clear();
 			typeList.add(UserMoneyDetailTypeEnum.fanli);
+			typeList.add(UserMoneyDetailTypeEnum.fanliNew);
 			typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);
+			typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuanNew);
 			typeList.add(UserMoneyDetailTypeEnum.share);
+			typeList.add(UserMoneyDetailTypeEnum.shareNew);
 			typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);
 			typeList.add(UserMoneyDetailTypeEnum.invite);
 			typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);
 			typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);
+			typeList.add(UserMoneyDetailTypeEnum.teamReward);
 			typeList.add(UserMoneyDetailTypeEnum.weiQuan);
 			typeList.add(UserMoneyDetailTypeEnum.hongbao);
 			typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);
@@ -271,13 +285,18 @@
 			// 鎬荤殑鍒拌处
 			typeList.clear();
 			typeList.add(UserMoneyDetailTypeEnum.fanli);
+			typeList.add(UserMoneyDetailTypeEnum.fanliNew);
 			typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);
+			typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuanNew);
 			typeList.add(UserMoneyDetailTypeEnum.orderReward);
+			typeList.add(UserMoneyDetailTypeEnum.orderRewardNew);
 			typeList.add(UserMoneyDetailTypeEnum.share);
+			typeList.add(UserMoneyDetailTypeEnum.shareNew);
 			typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);
 			typeList.add(UserMoneyDetailTypeEnum.invite);
 			typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);
 			typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);
+			typeList.add(UserMoneyDetailTypeEnum.teamReward);
 			typeList.add(UserMoneyDetailTypeEnum.weiQuan);
 			typeList.add(UserMoneyDetailTypeEnum.hongbao);
 			typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);
@@ -294,15 +313,20 @@
 			// 鎬荤殑鑷喘杩斿埄
 			typeList.clear();
 			typeList.add(UserMoneyDetailTypeEnum.fanli);
+			typeList.add(UserMoneyDetailTypeEnum.fanliNew);
 			typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);
+			typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuanNew);
 			typeList.add(UserMoneyDetailTypeEnum.orderReward);
+			typeList.add(UserMoneyDetailTypeEnum.orderRewardNew);
 			vo.setTotalFanLiMoney(
 					userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());
 
 			// 绱鎴愬姛鎻愮幇
 			typeList.clear();
 			typeList.add(UserMoneyDetailTypeEnum.extract);
+			typeList.add(UserMoneyDetailTypeEnum.extractNew);
 			typeList.add(UserMoneyDetailTypeEnum.extractVerify);
+			typeList.add(UserMoneyDetailTypeEnum.extractVerifyNew);
 			typeList.add(UserMoneyDetailTypeEnum.extractAutoWX);
 			typeList.add(UserMoneyDetailTypeEnum.extractReject);
 			vo.setTotalExtractMoney(
@@ -312,6 +336,7 @@
 		// 鎬荤殑鍒嗕韩璧�
 		typeList.clear();
 		typeList.add(UserMoneyDetailTypeEnum.share);
+		typeList.add(UserMoneyDetailTypeEnum.shareNew);
 		typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);
 		vo.setTotalShareMoney(
 				userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());

--
Gitblit v1.8.0