From e7920b14a9baab97035a1a529da85d124a2bcacd Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期二, 16 六月 2020 10:54:29 +0800 Subject: [PATCH] 云发单对测试用户显示 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java | 84 ++++++++++++++++++++++++++++++------------ 1 files changed, 60 insertions(+), 24 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 41b24cb..00854ce 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 @@ -32,7 +32,7 @@ import com.yeshi.fanli.entity.money.TeamEincomeRecord; import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum; import com.yeshi.fanli.entity.order.OrderMoneyDailyCount; -import com.yeshi.fanli.entity.order.OrderMoneyDailyCount.SourceTypeEnum; +import com.yeshi.fanli.entity.order.SourceTypeEnum; import com.yeshi.fanli.entity.system.ConfigKeyEnum; import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.inter.config.ConfigService; @@ -50,6 +50,7 @@ import com.yeshi.fanli.util.MoneyBigDecimalUtil; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TimeUtil; +import com.yeshi.fanli.util.VersionUtil; import com.yeshi.fanli.util.account.UserUtil; import com.yeshi.fanli.vo.money.IncomeDetailVO; import com.yeshi.fanli.vo.money.MoneyPredictVO; @@ -143,26 +144,37 @@ if (vo != null) { vo.setLink(configService.get(ConfigKeyEnum.autoExtractHelpUrl.getKey())); vo.setExtractDesc("鎻愮幇閲戦灏辨槸宸叉垚鍔熸彁鐜板埌鏀粯瀹濈殑璧勯噾"); - vo.setMoneyArrivalDesc("璁㈠崟宸插埌璐﹀悗鎻愮幇鏃堕棿鍜岄噾棰濆潎涓嶅彈闄愬埗"); + 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); + } } } if (vo == null) { - vo = createMoneyStatistic(uid); + vo = createMoneyStatistic(uid, acceptData); } Gson gson = getGson(); out.print(JsonUtil.loadTrueResult(gson.toJson(vo))); } - public MoneyStatisticVO createMoneyStatistic(Long uid) { + private MoneyStatisticVO createMoneyStatistic(Long uid, AcceptData acceptData) { UserInfo user = userInfoService.getUserById(uid); MoneyStatisticVO vo = new MoneyStatisticVO(); vo.setLink(configService.get(ConfigKeyEnum.autoExtractHelpUrl.getKey())); vo.setBalanceMoney(user.getMyHongBao()); vo.setExtractDesc("鎻愮幇閲戦灏辨槸宸叉垚鍔熸彁鐜板埌鏀粯瀹濈殑璧勯噾"); - vo.setMoneyArrivalDesc("璁㈠崟宸插埌璐﹀悗鎻愮幇鏃堕棿鍜岄噾棰濆潎涓嶅彈闄愬埗"); // 鑾峰彇鎻愮幇涓殑淇℃伅 BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid); @@ -238,22 +250,43 @@ vo.setTotalInviteMoney( userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs()); - // 鏈湀鏀惰揣 - maxDate = new Date(timeStamp); - calendar = Calendar.getInstance(); - minDate = new Date(TimeUtil - .convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M")); - calendar.add(Calendar.MONTH, -1); - vo.setMonthSettleMoney(hongBaoV2CountService.sumMoneyBySettleTimeAndUid(uid, minDate, maxDate)); + + if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) { + vo.setMoneyArrivalDesc("灏芥棭纭鏀惰揣鍙互淇冧娇璧勯噾灏芥棭鍒拌处"); + + minDate = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(timeStamp, "yyyy-MM"), "yyyy-MM")); + Calendar ca = Calendar.getInstance(); + ca.setTime(new Date(timeStamp)); + ca.add(Calendar.MONTH, 1); + maxDate = new Date( + TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(ca.getTimeInMillis(), "yyyy-MM"), "yyyy-MM")); + // 鏈湀鏈埌璐� + 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)); + } else { + vo.setMoneyArrivalDesc("璁㈠崟宸插埌璐﹀悗鎻愮幇鏃堕棿鍜岄噾棰濆潎涓嶅彈闄愬埗"); + // 鏈湀鏀惰揣 + maxDate = new Date(timeStamp); + calendar = Calendar.getInstance(); + minDate = new Date(TimeUtil + .convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M")); + calendar.add(Calendar.MONTH, -1); + vo.setMonthSettleMoney(hongBaoV2CountService.sumMoneyBySettleTimeAndUid(uid, minDate, maxDate)); - // 涓婃湀鏀惰揣 - maxDate = new Date(TimeUtil - .convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M")); - calendar.add(Calendar.MONTH, -1); - minDate = new Date(TimeUtil - .convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M")); - vo.setLastMonthSettleMoney(hongBaoV2CountService.sumMoneyBySettleTimeAndUid(uid, minDate, maxDate)); - + // 涓婃湀鏀惰揣 + maxDate = new Date(TimeUtil + .convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M")); + calendar.add(Calendar.MONTH, -1); + minDate = new Date(TimeUtil + .convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M")); + vo.setLastMonthSettleMoney(hongBaoV2CountService.sumMoneyBySettleTimeAndUid(uid, minDate, maxDate)); + } + // 寰呯‘璁ゆ敹璐э紙180澶╁唴锛� vo.setNotSettleMoney(hongBaoV2CountService.sumMoneyByANotSettleAndUid(uid)); @@ -336,6 +369,8 @@ return; } + long count = 0; + List<Extract> list = null; String redisContent = previewInfoService.getRedisContent(uid, PreviewEnum.extractRecord); if (!StringUtil.isNullOrEmpty(redisContent)) { @@ -344,13 +379,14 @@ }.getType()); } - // 鏌ヨ鐪熷疄 - long count = 0; - if (list == null) { + if (list != null && list.size() > 0) {// 鏈夐瑙堟暟鎹� + count=list.size(); + } else {// 鏃犻瑙堟暟鎹� list = extractService.getExtractSucceedRecord(page, Constant.PAGE_SIZE, uid); count = extractService.countExtractSucceedRecord(uid); } + // 鏌ヨ鐪熷疄 if (list == null) list = new ArrayList<>(); @@ -371,7 +407,7 @@ } JSONObject json = new JSONObject(); - json.put("count", count == 0 ? list.size() : 0); + json.put("count", count); json.put("list", JSONArray); out.print(JsonUtil.loadTrueResult(json)); } -- Gitblit v1.8.0