From a5fde818ef9969e2e53acfa29b2e6f423bd0c8fc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 30 四月 2020 19:02:51 +0800
Subject: [PATCH] 小米推送bug修改，增加用户团队信息消费
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java | 64 ++++++++++++++++++++++----------
1 files changed, 44 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..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);
@@ -201,7 +204,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();
@@ -210,22 +213,28 @@
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());
-
-
+
if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
// 涓婃湀鏀跺叆
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);
@@ -238,23 +247,26 @@
vo.setLatestThreeMonthRecievedMoney(
userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());
-
+
// 鏈湀鍒拌处
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);
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,60 +276,71 @@
// 鏈湀鏈埌璐�
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);
+ 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);
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();
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(
userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate, 1).abs());
}
-
+
// 鎬荤殑鍒嗕韩璧�
typeList.clear();
typeList.add(UserMoneyDetailTypeEnum.share);
+ typeList.add(UserMoneyDetailTypeEnum.shareNew);
typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);
vo.setTotalShareMoney(
userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());
-
+
// 鎬荤殑閭�璇疯禋
typeList.clear();
typeList.add(UserMoneyDetailTypeEnum.invite);
@@ -325,12 +348,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 +367,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