From 498baaf2883033c08f09d2999cea96e1d4fbb4c4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 18 十二月 2018 09:57:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
index 7beb824..66e5ee0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
@@ -140,17 +140,16 @@
int myTeamCount = myFirstTeamCount + mySecondTeamCount;
data.put("myTeam", myTeamCount);
// 浠婃棩 鏈湀棰勪及鏀剁泭
- BigDecimal moneyToday = inviteGetMoneyService.getMoneyToday(uid);
+ BigDecimal moneyToday = inviteGetMoneyService.getMoneyToday(uid + "");
if (moneyToday == null) {
moneyToday = new BigDecimal(0);
}
-
- BigDecimal moneyMonth = inviteGetMoneyService.getMoneyMonth(uid);
+ BigDecimal moneyMonth = inviteGetMoneyService.getMoneyMonth(uid + "");
if (moneyMonth == null) {
moneyMonth = new BigDecimal(0);
}
- BigDecimal moneyLastMonth = inviteGetMoneyService.getMoneyLastMonth(uid);
+ BigDecimal moneyLastMonth = inviteGetMoneyService.getMoneyLastMonth(uid + "");
data.put("moneyToday", moneyToday.setScale(2, BigDecimal.ROUND_DOWN));
data.put("moneyMonth", moneyMonth.setScale(2, BigDecimal.ROUND_DOWN));
--
Gitblit v1.8.0