From ee5c8055b1c0dd7c67a9025a76b10bd287c93d9a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 09:52:27 +0800
Subject: [PATCH] 资金明细增加团队分红

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java |   39 +++++++++++++++++++--------------------
 1 files changed, 19 insertions(+), 20 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 69668d7..d0791f2 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
@@ -201,7 +201,7 @@
 				.convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));
 		vo.setLastMonthExtractMoney(
 				userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate, 1).abs());
-		
+
 		// 鏈湀鎻愮幇
 		maxDate = new Date(timeStamp);
 		calendar = Calendar.getInstance();
@@ -214,8 +214,7 @@
 		typeList.add(UserMoneyDetailTypeEnum.extractReject);
 		vo.setMonthExtractMoney(
 				userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate, 1).abs());
-		
-		
+
 		if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
 			// 涓婃湀鏀跺叆
 			typeList.clear();
@@ -238,7 +237,7 @@
 
 			vo.setLatestThreeMonthRecievedMoney(
 					userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());
-		
+
 			// 鏈湀鍒拌处
 			typeList.clear();
 			typeList.add(UserMoneyDetailTypeEnum.fanli);
@@ -253,8 +252,7 @@
 			typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);
 			vo.setMonthRecievedMoney(
 					userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());
-		
-			
+
 			minDate = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(timeStamp, "yyyy-MM"), "yyyy-MM"));
 			Calendar ca = Calendar.getInstance();
 			ca.setTime(new Date(timeStamp));
@@ -264,12 +262,12 @@
 			// 鏈湀鏈埌璐�
 			BigDecimal monthUnRecievedMoney = hongBaoV2Service.getUnRecievedMoneyWithPreGetTime(uid, minDate, maxDate);
 			vo.setMonthUnRecievedMoney(monthUnRecievedMoney);
-	
+
 			// 鍏ㄩ儴鏈埌璐�
 			minDate = new Date(0);
 			maxDate = new Date(timeStamp);
 			vo.setTotalUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithCreateTime(uid, minDate, maxDate));
-			
+
 			// 鎬荤殑鍒拌处
 			typeList.clear();
 			typeList.add(UserMoneyDetailTypeEnum.fanli);
@@ -284,14 +282,14 @@
 			typeList.add(UserMoneyDetailTypeEnum.hongbao);
 			typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);
 			typeList.add(UserMoneyDetailTypeEnum.subsidy);
-			typeList.add(UserMoneyDetailTypeEnum.orderTeamDividents);
+			typeList.add(UserMoneyDetailTypeEnum.teamReward);
 			vo.setTotalRecievedMoney(
 					userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());
 		}
-		
+
 		minDate = new Date(0L);
 		maxDate = new Date(timeStamp);
-		
+
 		if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
 			// 鎬荤殑鑷喘杩斿埄
 			typeList.clear();
@@ -300,7 +298,7 @@
 			typeList.add(UserMoneyDetailTypeEnum.orderReward);
 			vo.setTotalFanLiMoney(
 					userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());
-			
+
 			// 绱鎴愬姛鎻愮幇
 			typeList.clear();
 			typeList.add(UserMoneyDetailTypeEnum.extract);
@@ -310,14 +308,14 @@
 			vo.setTotalExtractMoney(
 					userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate, 1).abs());
 		}
-		
+
 		// 鎬荤殑鍒嗕韩璧�
 		typeList.clear();
 		typeList.add(UserMoneyDetailTypeEnum.share);
 		typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);
 		vo.setTotalShareMoney(
 				userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());
-		
+
 		// 鎬荤殑閭�璇疯禋
 		typeList.clear();
 		typeList.add(UserMoneyDetailTypeEnum.invite);
@@ -325,12 +323,12 @@
 		typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);
 		if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
 			typeList.add(UserMoneyDetailTypeEnum.subsidy);
-			typeList.add(UserMoneyDetailTypeEnum.orderTeamDividents);
+			typeList.add(UserMoneyDetailTypeEnum.teamReward);
 		}
+		
 		vo.setTotalInviteMoney(
 				userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());
-		
-					
+
 		GsonBuilder builder = new GsonBuilder();
 		builder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {
 			@Override
@@ -344,13 +342,14 @@
 				}
 			}
 		});
-		
+
 		// 鑾峰彇鎻愮幇涓殑淇℃伅
 		BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);
 		if (extractingMoney.compareTo(new BigDecimal(0)) > 0)
 			vo.setExtractingMoneyInfo("鎻愮幇涓�:楼" + extractingMoney.setScale(2, RoundingMode.HALF_UP));
-		
-		if (VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion()) && !VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+
+		if (VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion())
+				&& !VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
 			// 鑾峰彇鏄惁缁戝畾浜嗗井淇�
 			if (!StringUtil.isNullOrEmpty(user.getWxUnionId())) {
 				vo.setBindingWX(true);

--
Gitblit v1.8.0