From 64bd2204be459b47e008b79073a143684140ff24 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 18:20:45 +0800
Subject: [PATCH] mapper xml文件位置移动
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java
index 5c137c0..611ed38 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java
@@ -142,12 +142,20 @@
if (!StringUtil.isNullOrEmpty(redisContent)) {
vo = new Gson().fromJson(redisContent, MoneyStatisticVO.class);
if (vo != null) {
- vo.setLink(configService.get(ConfigKeyEnum.autoExtractHelpUrl.getKey()));
+ vo.setLink(configService.getValue(ConfigKeyEnum.autoExtractHelpUrl.getKey(),acceptData.getSystem()));
vo.setExtractDesc("鎻愮幇閲戦灏辨槸宸叉垚鍔熸彁鐜板埌鏀粯瀹濈殑璧勯噾");
if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {
vo.setMoneyArrivalDesc("灏芥棭纭鏀惰揣鍙互淇冧娇璧勯噾灏芥棭鍒拌处");
} else {
vo.setMoneyArrivalDesc("璁㈠崟宸插埌璐﹀悗鎻愮幇鏃堕棿鍜岄噾棰濆潎涓嶅彈闄愬埗");
+ }
+
+ if(vo.getLastMonthSettleMoney() == null) {
+ vo.setLastMonthExtractMoney(BigDecimal.ZERO);
+ }
+
+ if(vo.getNotSettleMoney() == null) {
+ vo.setNotSettleMoney(BigDecimal.ZERO);
}
}
}
@@ -164,7 +172,7 @@
UserInfo user = userInfoService.getUserById(uid);
MoneyStatisticVO vo = new MoneyStatisticVO();
- vo.setLink(configService.get(ConfigKeyEnum.autoExtractHelpUrl.getKey()));
+ vo.setLink(configService.getValue(ConfigKeyEnum.autoExtractHelpUrl.getKey(),acceptData.getSystem()));
vo.setBalanceMoney(user.getMyHongBao());
vo.setExtractDesc("鎻愮幇閲戦灏辨槸宸叉垚鍔熸彁鐜板埌鏀粯瀹濈殑璧勯噾");
@@ -306,7 +314,7 @@
UserInfo user = userInfoService.getUserById(uid);
MoneyStatisticVO vo = new MoneyStatisticVO();
- vo.setLink(configService.get(ConfigKeyEnum.autoExtractHelpUrl.getKey()));
+ vo.setLink(configService.getValue(ConfigKeyEnum.autoExtractHelpUrl.getKey(),acceptData.getSystem()));
vo.setBalanceMoney(user.getMyHongBao());
// 鑾峰彇鎻愮幇涓殑淇℃伅
BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);
@@ -865,7 +873,6 @@
* 璁㈠崟缁熻-h5
*
* @param acceptData
- * @param id
* @param out
*/
@RequestMapping(value = "countTeamOrderNum")
--
Gitblit v1.8.0