From dda8f9a2347be94b8d8df1417a8feb96fc30ae54 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 五月 2020 13:20:34 +0800
Subject: [PATCH] 订单统计任务添加，用户资金信息接口添加
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java | 97 +++++++++++++++++++++++++++++-------------------
1 files changed, 58 insertions(+), 39 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 eda6631..31039f3 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
@@ -87,11 +87,10 @@
@Resource
private OrderMoneyDailyCountService orderMoneyDailyCountService;
-
+
@Resource
private TeamEincomeRecordService teamEincomeRecordService;
-
private Gson getGson() {
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {
@@ -108,7 +107,7 @@
});
return builder.create();
}
-
+
/**
* 鐢ㄦ埛璧勯噾缁熻
*
@@ -128,7 +127,7 @@
vo.setLink(configService.get(ConfigKeyEnum.autoExtractHelpUrl.getKey()));
vo.setBalanceMoney(user.getMyHongBao());
vo.setExtractDesc("鎻愮幇閲戦灏辨槸宸叉垚鍔熻浆璐﹀埌鎻愮幇鏀粯瀹濈殑璧勯噾銆�");
- vo.setMoneyArrivalDesc("璧勯噾宸插埌璐﹀悗鎻愮幇鏃堕棿涓嶅彈闄愬埗銆侀噾棰濆彈闄愬埗銆�");
+ vo.setMoneyArrivalDesc("璧勯噾宸插埌璐﹀悗鎻愮幇鏃堕棿涓嶅彈闄愬埗銆侀噾棰濅笉鍙楅檺鍒躲��");
// 鑾峰彇鎻愮幇涓殑淇℃伅
BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);
@@ -239,9 +238,25 @@
Gson gson = getGson();
out.print(JsonUtil.loadTrueResult(gson.toJson(vo)));
}
-
-
-
+
+ @RequestMapping(value = "getUserMoneyInfo")
+ public void getUserMoneyInfo(AcceptData acceptData, Long uid, PrintWriter out) {
+ if (uid == null || uid == 0) {
+ out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+ UserInfo user = userInfoService.getUserById(uid);
+
+ MoneyStatisticVO vo = new MoneyStatisticVO();
+ vo.setLink(configService.get(ConfigKeyEnum.autoExtractHelpUrl.getKey()));
+ vo.setBalanceMoney(user.getMyHongBao());
+ // 鑾峰彇鎻愮幇涓殑淇℃伅
+ BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);
+ if (extractingMoney.compareTo(new BigDecimal(0)) > 0)
+ vo.setExtractingMoneyInfo("鎻愮幇涓�:楼" + extractingMoney.setScale(2, RoundingMode.HALF_UP));
+ Gson gson = getGson();
+ out.print(JsonUtil.loadTrueResult(gson.toJson(vo)));
+ }
private MoneyPredictVO cratePredictVO(List<OrderMoneyDailyCount> list) {
MoneyPredictVO predictVO = new MoneyPredictVO();
@@ -257,9 +272,11 @@
if (dailyCount.getOrderNumTeam() != null)
predictVO.setTeamNum(predictVO.getTeamNum() + dailyCount.getOrderNumTeam());
if (dailyCount.getIncome() != null)
- predictVO.setMineMoney(predictVO.getMineMoney().add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncome()), hundred)));
+ predictVO.setMineMoney(predictVO.getMineMoney()
+ .add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncome()), hundred)));
if (dailyCount.getIncomeTeam() != null)
- predictVO.setTeamMoney(predictVO.getTeamMoney().add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncomeTeam()), hundred)));
+ predictVO.setTeamMoney(predictVO.getTeamMoney()
+ .add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncomeTeam()), hundred)));
}
}
predictVO.setTotalNum(predictVO.getTeamNum() + predictVO.getMineNum());
@@ -308,8 +325,6 @@
out.print(JsonUtil.loadTrueResult(json));
}
-
-
/**
* 鍘嗗彶璇︽儏
*
@@ -387,19 +402,23 @@
Date countDay = dailyCount.getCountDay();
if (datetype == 1 && countDay != null && countDate.equals(formatDay.format(countDay))) {
predictVO.setMineNum(dailyCount.getOrderNum());
- predictVO.setMineMoney(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncome()), hundred));
+ predictVO.setMineMoney(
+ MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncome()), hundred));
predictVO.setTeamNum(dailyCount.getOrderNumTeam());
- predictVO.setTeamMoney(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncomeTeam()), hundred));
+ predictVO.setTeamMoney(
+ MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncomeTeam()), hundred));
break;
}
String yearMonth = dailyCount.getYearMonth();
- if (datetype == 2 && !StringUtil.isNullOrEmpty(yearMonth)
- && countDate.equals(formatMonth.format(TimeUtil.parseYYYYMMDD(DateUtil.getFirstDayOfMonth(yearMonth))))) {
+ if (datetype == 2 && !StringUtil.isNullOrEmpty(yearMonth) && countDate.equals(
+ formatMonth.format(TimeUtil.parseYYYYMMDD(DateUtil.getFirstDayOfMonth(yearMonth))))) {
predictVO.setMineNum(dailyCount.getOrderNum());
- predictVO.setMineMoney(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncome()), hundred));
+ predictVO.setMineMoney(
+ MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncome()), hundred));
predictVO.setTeamNum(dailyCount.getOrderNumTeam());
- predictVO.setTeamMoney(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncomeTeam()), hundred));
+ predictVO.setTeamMoney(
+ MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncomeTeam()), hundred));
break;
}
}
@@ -473,7 +492,8 @@
for (OrderMoneyDailyCount dailyCount : listDailyCount) {
if (dailyCount.getSourceType() == typeEnum) {
detail.setNum(detail.getNum() + dailyCount.getOrderNum());
- detail.setMoney(detail.getMoney().add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncome()), hundred)));
+ detail.setMoney(detail.getMoney()
+ .add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncome()), hundred)));
}
}
}
@@ -488,8 +508,6 @@
out.print(JsonUtil.loadTrueResult(object));
}
-
-
/**
* 鍥㈤槦鍒嗙孩
* @param acceptData
@@ -525,7 +543,6 @@
BigDecimal subsidy = teamEincomeRecordService.sumRecieveByType(uid, TeamEincomeRecord.TYPE_TEAM_SUBSIDY);
BigDecimal reward = teamEincomeRecordService.sumRecieveByType(uid, TeamEincomeRecord.TYPE_TEAM_DIVIDENTS);
-
Gson gson = getGson();
JSONObject object = new JSONObject();
object.put("total", subsidy.add(reward).setScale(2).toString());
@@ -535,10 +552,9 @@
object.put("month", gson.toJson(monthVO));
out.print(JsonUtil.loadTrueResult(object));
}
-
-
+
private TeamPredictVO crateTeamPredictVO(List<OrderMoneyDailyCount> list) {
- TeamPredictVO predictVO = new TeamPredictVO(BigDecimal.ZERO,0,BigDecimal.ZERO,0);
+ TeamPredictVO predictVO = new TeamPredictVO(BigDecimal.ZERO, 0, BigDecimal.ZERO, 0);
if (list != null && list.size() > 0) {
BigDecimal hundred = BigDecimal.valueOf(100);
for (OrderMoneyDailyCount dailyCount : list) {
@@ -547,20 +563,19 @@
if (dailyCount.getTeamSubsidyNum() != null)
predictVO.setSubsidyNum(predictVO.getSubsidyNum() + dailyCount.getTeamSubsidyNum());
if (dailyCount.getTeamReward() != null)
- predictVO.setReward(predictVO.getReward().add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamReward()), hundred)));
+ predictVO.setReward(predictVO.getReward()
+ .add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamReward()), hundred)));
if (dailyCount.getTeamSubsidy() != null)
- predictVO.setSubsidy(predictVO.getSubsidy().add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamSubsidy()), hundred)));
-
-
+ predictVO.setSubsidy(predictVO.getSubsidy()
+ .add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamSubsidy()), hundred)));
+
}
}
predictVO.setTotalNum(predictVO.getRewardNum() + predictVO.getSubsidyNum());
predictVO.setTotalMoney(predictVO.getReward().add(predictVO.getSubsidy()));
return predictVO;
}
-
-
-
+
/**
* 鍘嗗彶璇︽儏
*
@@ -570,7 +585,8 @@
* @param out
*/
@RequestMapping(value = "getTeamDividendHistory")
- public void getTeamDividendHistory(AcceptData acceptData, Long uid, String date, Integer datetype, PrintWriter out) {
+ public void getTeamDividendHistory(AcceptData acceptData, Long uid, String date, Integer datetype,
+ PrintWriter out) {
if (uid == null || uid == 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
@@ -638,19 +654,23 @@
Date countDay = dailyCount.getCountDay();
if (datetype == 1 && countDay != null && countDate.equals(formatDay.format(countDay))) {
predictVO.setRewardNum(dailyCount.getTeamRewardNum());
- predictVO.setReward(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamReward()), hundred));
+ predictVO.setReward(
+ MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamReward()), hundred));
predictVO.setSubsidyNum(dailyCount.getTeamSubsidyNum());
- predictVO.setSubsidy(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamSubsidy()), hundred));
+ predictVO.setSubsidy(
+ MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamSubsidy()), hundred));
break;
}
String yearMonth = dailyCount.getYearMonth();
- if (datetype == 2 && !StringUtil.isNullOrEmpty(yearMonth)
- && countDate.equals(formatMonth.format(TimeUtil.parseYYYYMMDD(DateUtil.getFirstDayOfMonth(yearMonth))))) {
+ if (datetype == 2 && !StringUtil.isNullOrEmpty(yearMonth) && countDate.equals(
+ formatMonth.format(TimeUtil.parseYYYYMMDD(DateUtil.getFirstDayOfMonth(yearMonth))))) {
predictVO.setRewardNum(dailyCount.getTeamRewardNum());
- predictVO.setReward(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamReward()), hundred));
+ predictVO.setReward(
+ MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamReward()), hundred));
predictVO.setSubsidyNum(dailyCount.getTeamSubsidyNum());
- predictVO.setSubsidy(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamSubsidy()), hundred));
+ predictVO.setSubsidy(
+ MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamSubsidy()), hundred));
break;
}
}
@@ -670,6 +690,5 @@
e.printStackTrace();
}
}
-
}
--
Gitblit v1.8.0