From aa66729ef758105dc1ced739ffe88e253affc37a Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 16 七月 2019 15:49:28 +0800
Subject: [PATCH] Merge branch 'master-bug'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
index 698c93e..8516a70 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
@@ -232,11 +232,26 @@
BigDecimal thisMonthWin = userTaoLiJinOriginService.countMoneyByDate(uid, 3);
BigDecimal lastMonthWin = userTaoLiJinOriginService.countMoneyByDate(uid, 4);
+ BigDecimal zero = new BigDecimal(0);
// 娑堣��
BigDecimal todayUse = userTaoLiJinDetailService.countUseMoneyByDate(uid, 1);
+ if (todayUse == null || todayUse.compareTo(zero) > 0) {
+ todayUse = zero;
+ }
+
BigDecimal yesterdayUse = userTaoLiJinDetailService.countUseMoneyByDate(uid, 2);
+ if (yesterdayUse == null || yesterdayUse.compareTo(zero) > 0) {
+ yesterdayUse = zero;
+ }
BigDecimal thisMonthUse = userTaoLiJinDetailService.countUseMoneyByDate(uid, 3);
+ if (thisMonthUse == null || thisMonthUse.compareTo(zero) > 0) {
+ thisMonthUse = zero;
+ }
BigDecimal lastMonthUse = userTaoLiJinDetailService.countUseMoneyByDate(uid, 4);
+ if (lastMonthUse == null || lastMonthUse.compareTo(zero) > 0) {
+ lastMonthUse = zero;
+ }
+
// 闂彿閾炬帴
String helpLink = configTaoLiJinService.getValueByKey("hongbao_help_link");
@@ -408,6 +423,7 @@
}
// 鐧诲綍鐢ㄦ埛
+ boolean isReceive = false;
JSONObject data = new JSONObject();
data.put("icon", configTaoLiJinService.getValueByKey("taolijin_system_icon"));
@@ -442,6 +458,7 @@
UserTaoLiJinOrigin userTaoLiJin = userTaoLiJinOriginService.getRankByThisMonth(uid, type);
if (userTaoLiJin != null) { // 宸查鍙�
isRank = true;
+ isReceive = true;
hasMoney = userTaoLiJin.getMoney();
} else {
isRank = false;
@@ -478,7 +495,11 @@
data.put("content", "鎺ㄥ箍绾㈠寘锛屽ソ鍙嬬鍒╋紒");
data.put("type", 1);
data.put("money", hasMoney.setScale(2).toString());
- data.put("usage", "棰嗗彇鎴愬姛锛屽凡瀛樺叆鈥滄垜鐨�-鎺ㄥ箍绾㈠寘鈥�");
+ if (isReceive) {
+ data.put("usage", "鏈湀棰嗗彇锛屽凡瀛樺叆鈥滄垜鐨�-鎺ㄥ箍绾㈠寘鈥�");
+ } else {
+ data.put("usage", "棰嗗彇鎴愬姛锛屽凡瀛樺叆鈥滄垜鐨�-鎺ㄥ箍绾㈠寘鈥�");
+ }
data.put("jumpName", "鍘讳娇鐢�");
data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));
data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_tip"));
--
Gitblit v1.8.0