From d48079c9eeec9c4f19f550a44d461275b4a31fd4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 01 六月 2020 16:47:59 +0800
Subject: [PATCH] 云发单
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java | 163 ++++++++++++++++++++++++++++++------------------------
1 files changed, 90 insertions(+), 73 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 2a75869..053b290 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
@@ -34,6 +34,7 @@
import com.yeshi.fanli.entity.order.OrderMoneyDailyCount;
import com.yeshi.fanli.entity.order.OrderMoneyDailyCount.SourceTypeEnum;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.money.TeamEincomeRecordService;
@@ -96,13 +97,12 @@
@Resource
private TeamEincomeRecordService teamEincomeRecordService;
-
+
@Resource
private PreviewInfoService previewInfoService;
-
+
@Resource
private TeamDividentsSourceOrderUserMapService teamDividentsSourceOrderUserMapService;
-
private Gson getGson() {
GsonBuilder builder = new GsonBuilder();
@@ -113,7 +113,7 @@
return new JsonPrimitive("");
} else {
// 淇濈暀2浣嶅皬鏁�
- value = value.setScale(2);
+ value = value.setScale(2, BigDecimal.ROUND_DOWN);
return new JsonPrimitive(value.toString());
}
}
@@ -134,7 +134,7 @@
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
-
+
// VIP鏁版嵁棰勮
MoneyStatisticVO vo = null;
String redisContent = previewInfoService.getRedisContent(uid, PreviewEnum.moneyInfo);
@@ -146,16 +146,15 @@
vo.setMoneyArrivalDesc("璁㈠崟宸插埌璐﹀悗鎻愮幇鏃堕棿鍜岄噾棰濆潎涓嶅彈闄愬埗");
}
}
-
+
if (vo == null) {
vo = createMoneyStatistic(uid);
}
-
+
Gson gson = getGson();
out.print(JsonUtil.loadTrueResult(gson.toJson(vo)));
}
-
-
+
public MoneyStatisticVO createMoneyStatistic(Long uid) {
UserInfo user = userInfoService.getUserById(uid);
@@ -272,8 +271,6 @@
vo.setMonthPredict(cratePredictVO(orderMoneyDailyCountService.query(uid, minDate, maxDate)));
return vo;
}
-
-
@RequestMapping(value = "getUserMoneyInfo")
public void getUserMoneyInfo(AcceptData acceptData, Long uid, PrintWriter out) {
@@ -307,6 +304,10 @@
predictVO.setMineNum(predictVO.getMineNum() + dailyCount.getOrderNum());
if (dailyCount.getOrderNumTeam() != null)
predictVO.setTeamNum(predictVO.getTeamNum() + dailyCount.getOrderNumTeam());
+
+ if (dailyCount.getTeamDividentsOrderNum() != null)
+ predictVO.setTotalNum(predictVO.getTotalNum() + dailyCount.getTeamDividentsOrderNum());
+
if (dailyCount.getIncome() != null)
predictVO.setMineMoney(predictVO.getMineMoney()
.add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncome()), hundred)));
@@ -315,7 +316,7 @@
.add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncomeTeam()), hundred)));
}
}
- predictVO.setTotalNum(predictVO.getTeamNum() + predictVO.getMineNum());
+ predictVO.setTotalNum(predictVO.getTotalNum());
predictVO.setTotalMoney(predictVO.getMineMoney().add(predictVO.getTeamMoney()));
return predictVO;
}
@@ -338,16 +339,17 @@
String redisContent = previewInfoService.getRedisContent(uid, PreviewEnum.extractRecord);
if (!StringUtil.isNullOrEmpty(redisContent)) {
Gson gson = new Gson();
- list = gson.fromJson(redisContent, new TypeToken<ArrayList<Extract>>() {}.getType());
+ list = gson.fromJson(redisContent, new TypeToken<ArrayList<Extract>>() {
+ }.getType());
}
-
+
// 鏌ヨ鐪熷疄
long count = 0;
if (list == null) {
list = extractService.getExtractSucceedRecord(page, Constant.PAGE_SIZE, uid);
count = extractService.countExtractSucceedRecord(uid);
}
-
+
if (list == null)
list = new ArrayList<>();
@@ -483,7 +485,9 @@
object.put("list", gson.toJson(list));
out.print(JsonUtil.loadTrueResult(object));
} catch (ParseException e) {
+ out.print(JsonUtil.loadFalseResult(1, "鏌ヨ澶辫触"));
e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
}
}
@@ -602,7 +606,7 @@
}
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, 0);
if (list != null && list.size() > 0) {
BigDecimal hundred = BigDecimal.valueOf(100);
for (OrderMoneyDailyCount dailyCount : list) {
@@ -617,9 +621,12 @@
predictVO.setSubsidy(predictVO.getSubsidy()
.add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamSubsidy()), hundred)));
+ if (dailyCount.getTeamDividentsOrderNum() != null)
+ predictVO.setTotalNum(predictVO.getTotalNum() + dailyCount.getTeamDividentsOrderNum());
+
}
}
- predictVO.setTotalNum(predictVO.getRewardNum() + predictVO.getSubsidyNum());
+ predictVO.setTotalNum(predictVO.getTotalNum());
predictVO.setTotalMoney(predictVO.getReward().add(predictVO.getSubsidy()));
return predictVO;
}
@@ -658,7 +665,7 @@
int countNum = 7;
Date day = TimeUtil.parseYYYYMMDD(date);
for (int i = 0; i < countNum; i++) {
- TeamPredictVO predictVO = new TeamPredictVO(zero, 0, zero, 0);
+ TeamPredictVO predictVO = new TeamPredictVO(zero, 0, zero, 0, 0);
if (i == 0) {
predictVO.setCountDate(formatDay.format(day));
} else {
@@ -677,7 +684,7 @@
int countNum = 3;
Date day = TimeUtil.parseYYYYMMDD(DateUtil.getFirstDayOfMonth(date));
for (int i = 0; i < countNum; i++) {
- TeamPredictVO predictVO = new TeamPredictVO(zero, 0, zero, 0);
+ TeamPredictVO predictVO = new TeamPredictVO(zero, 0, zero, 0, 0);
if (i == 0) {
predictVO.setCountDate(formatMonth.format(day));
} else {
@@ -707,6 +714,7 @@
predictVO.setSubsidyNum(dailyCount.getTeamSubsidyNum());
predictVO.setSubsidy(
MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamSubsidy()), hundred));
+ predictVO.setTotalNum(dailyCount.getTeamDividentsOrderNum());
break;
}
@@ -719,12 +727,14 @@
predictVO.setSubsidyNum(dailyCount.getTeamSubsidyNum());
predictVO.setSubsidy(
MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamSubsidy()), hundred));
+
+ predictVO.setTotalNum(dailyCount.getTeamDividentsOrderNum());
break;
}
}
}
- predictVO.setTotalNum(predictVO.getRewardNum() + predictVO.getSubsidyNum());
+ predictVO.setTotalNum(predictVO.getTotalNum());
predictVO.setTotalMoney(predictVO.getReward().add(predictVO.getSubsidy()));
}
@@ -735,13 +745,12 @@
object.put("list", gson.toJson(list));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));
} catch (ParseException e) {
- e.printStackTrace();
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("缁熻澶辫触"));
+ e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
}
}
-
-
/**
* 鍒嗙孩璇︽儏
*
@@ -751,8 +760,8 @@
* @param out
*/
@RequestMapping(value = "getTeamDividendDetail")
- public void getTeamDividendDetail(String callback, AcceptData acceptData, Integer page, Long uid,
- String date, Integer datetype, String key, PrintWriter out) {
+ public void getTeamDividendDetail(String callback, AcceptData acceptData, Integer page, Long uid, String date,
+ Integer datetype, String key, PrintWriter out) {
if (uid == null || uid == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
@@ -762,11 +771,10 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍙傛暟涓嶅畬鏁�"));
return;
}
-
+
if (page == null)
page = 1;
int pageSize = Constant.PAGE_SIZE;
-
try {
Date minDay = new Date();
@@ -778,51 +786,52 @@
minDay = TimeUtil.parseYYYYMMDD(DateUtil.getFirstDayOfMonth(date));
maxDay = TimeUtil.parseYYYYMMDD_HHMMSS(DateUtil.getLastDayOfMonth(date) + " 23:59:59");
}
- List<TeamDividentsVO> list = teamDividentsSourceOrderUserMapService.listByDateAndTargetUid((page-1) * pageSize, pageSize, uid, minDay, maxDay);
+ List<TeamDividentsVO> list = teamDividentsSourceOrderUserMapService
+ .listByDateAndTargetUid((page - 1) * pageSize, pageSize, uid, minDay, maxDay, key);
if (list == null) {
list = new ArrayList<>();
}
- long count = teamDividentsSourceOrderUserMapService.countByDateAndTargetUid(uid, minDay, maxDay);
-
+ long count = teamDividentsSourceOrderUserMapService.countByDateAndTargetUid(uid, minDay, maxDay, key);
+
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {
@Override
public JsonElement serialize(BigDecimal value, Type theType, JsonSerializationContext context) {
if (value == null) {
- return new JsonPrimitive("0.000");
+ return new JsonPrimitive("0.00");
} else {
- // 淇濈暀2浣嶅皬鏁�
- value = value.setScale(3);
+ // 淇濈暀3浣嶅皬鏁�
+ value = value.setScale(3, RoundingMode.DOWN);
return new JsonPrimitive(value.toString());
}
}
});
-
+
Gson gson = builder.create();
JSONObject object = new JSONObject();
if (page == 1) {
- TeamDividentsVO teamDividentsVO = teamDividentsSourceOrderUserMapService.sumByDateAndTargetUid(uid, minDay, maxDay);
+ TeamDividentsVO teamDividentsVO = teamDividentsSourceOrderUserMapService.sumByDateAndTargetUid(uid,
+ minDay, maxDay, key);
if (teamDividentsVO == null) {
teamDividentsVO = new TeamDividentsVO();
teamDividentsVO.setSubsidy(BigDecimal.ZERO);
teamDividentsVO.setDividents(BigDecimal.ZERO);
}
- object.put("subsidy", teamDividentsVO.getSubsidy().setScale(3).toString());
- object.put("dividents", teamDividentsVO.getDividents().setScale(3).toString());
+ object.put("subsidy", teamDividentsVO.getSubsidy().setScale(2, RoundingMode.DOWN).toString());
+ object.put("dividents", teamDividentsVO.getDividents().setScale(2, RoundingMode.DOWN).toString());
}
-
-
+
object.put("count", count);
object.put("list", gson.toJson(list));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));
} catch (Exception e) {
- e.printStackTrace();
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
+ e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
}
}
-
/**
* 璁㈠崟缁熻-h5
*
@@ -833,57 +842,60 @@
@RequestMapping(value = "countTeamOrderNum")
public void countTeamOrderNum(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
try {
-
+
Date minDate = null;
Date maxDate = null;
long timeStamp = System.currentTimeMillis();
-
+
Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(timeStamp);
-
+
// 浠婃棩棰勪及
calendar.add(Calendar.DAY_OF_YEAR, -1);
minDate = new Date(TimeUtil.convertDateToTemp(TimeUtil.getGernalTime(timeStamp)));
- OrderMoneyDailyCount todayRecord = createVO(orderMoneyDailyCountService.sumTeamOrderNumGroupByCountDay(uid, minDate, null));
+ OrderMoneyDailyCount todayRecord = createVO(
+ orderMoneyDailyCountService.sumTeamOrderNumGroupByCountDay(uid, minDate, null));
// 鏄ㄦ棩棰勪及
calendar.add(Calendar.DAY_OF_YEAR, -1);
maxDate = new Date(TimeUtil.convertDateToTemp(TimeUtil.getGernalTime(timeStamp)));
minDate = DateUtil.reduceDay(1, maxDate);
- OrderMoneyDailyCount yesterdayRecord = createVO(orderMoneyDailyCountService.sumTeamOrderNumGroupByCountDay(uid, minDate, maxDate));
+ OrderMoneyDailyCount yesterdayRecord = createVO(
+ orderMoneyDailyCountService.sumTeamOrderNumGroupByCountDay(uid, minDate, maxDate));
// 鏈湀棰勪及
maxDate = new Date(timeStamp);
calendar = Calendar.getInstance();
- minDate = new Date(TimeUtil
- .convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));
+ minDate = new Date(TimeUtil.convertToTimeTemp(
+ calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));
calendar.add(Calendar.MONTH, -1);
- OrderMoneyDailyCount monthRecord = createVO(orderMoneyDailyCountService.sumTeamOrderNumGroupByYearMonth(uid, minDate, maxDate));
-
+ OrderMoneyDailyCount monthRecord = createVO(
+ orderMoneyDailyCountService.sumTeamOrderNumGroupByYearMonth(uid, minDate, maxDate));
+
// 绱
- OrderMoneyDailyCount totalityRecord = createVO(orderMoneyDailyCountService.sumTeamOrderNumGroupByUid(uid, null, null));
-
+ OrderMoneyDailyCount totalityRecord = createVO(
+ orderMoneyDailyCountService.sumTeamOrderNumGroupByUid(uid, null, null));
+
JSONObject today = new JSONObject();
today.put("direct", todayRecord.getDirectOrderNum());
today.put("indirect", todayRecord.getInDirectOrderNum());
today.put("beyond", todayRecord.getBeyondOrderNum());
-
+
JSONObject yesterday = new JSONObject();
yesterday.put("direct", yesterdayRecord.getDirectOrderNum());
yesterday.put("indirect", yesterdayRecord.getInDirectOrderNum());
yesterday.put("beyond", yesterdayRecord.getBeyondOrderNum());
-
+
JSONObject month = new JSONObject();
month.put("direct", monthRecord.getDirectOrderNum());
month.put("indirect", monthRecord.getInDirectOrderNum());
month.put("beyond", monthRecord.getBeyondOrderNum());
-
+
JSONObject totality = new JSONObject();
totality.put("direct", totalityRecord.getDirectOrderNum());
totality.put("indirect", totalityRecord.getInDirectOrderNum());
totality.put("beyond", totalityRecord.getBeyondOrderNum());
-
-
+
JSONObject json = new JSONObject();
json.put("today", today);
json.put("yesterday", yesterday);
@@ -893,24 +905,22 @@
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("缁熻澶辫触"));
e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
}
}
-
-
+
private OrderMoneyDailyCount createVO(List<OrderMoneyDailyCount> list) {
- OrderMoneyDailyCount totalityRecord = new OrderMoneyDailyCount(0,0,0);
+ OrderMoneyDailyCount totalityRecord = new OrderMoneyDailyCount(0, 0, 0);
if (list != null && list.size() > 0) {
- for (OrderMoneyDailyCount record: list) {
+ for (OrderMoneyDailyCount record : list) {
totalityRecord.setDirectOrderNum(totalityRecord.getDirectOrderNum() + record.getDirectOrderNum());
totalityRecord.setInDirectOrderNum(totalityRecord.getInDirectOrderNum() + record.getInDirectOrderNum());
totalityRecord.setBeyondOrderNum(totalityRecord.getBeyondOrderNum() + record.getBeyondOrderNum());
}
- }
+ }
return totalityRecord;
}
-
-
-
+
/**
* 璁㈠崟鎺掕姒�
* @param callback
@@ -925,15 +935,15 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍙傛暟缂哄け"));
return;
}
-
+
try {
Date minDate = null;
Date maxDate = null;
long timeStamp = System.currentTimeMillis();
-
+
Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(timeStamp);
-
+
if (dateType == 1) {
// 浠婃棩
calendar.add(Calendar.DAY_OF_YEAR, -1);
@@ -947,26 +957,33 @@
// 鏈湀
maxDate = new Date(timeStamp);
calendar = Calendar.getInstance();
- minDate = new Date(TimeUtil
- .convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));
+ minDate = new Date(TimeUtil.convertToTimeTemp(
+ calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));
calendar.add(Calendar.MONTH, -1);
}
-
+
List<OrderRankingVO> list = orderMoneyDailyCountService.getRankingByOrderNum(uid, minDate, maxDate);
if (list.size() > 0) {
- for (OrderRankingVO vo: list) {
+ for (int i = 0; i < list.size(); i++) {
+ OrderRankingVO vo = list.get(i);
UserInfo user = userInfoService.getUserByIdWithMybatis(vo.getUid());
+ if (user == null) {
+ list.remove(i);
+ i--;
+ continue;
+ }
vo.setNickName(user.getNickName());
vo.setPortrait(user.getPortrait());
}
}
-
+
JSONObject json = new JSONObject();
json.put("list", list);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(json));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("缁熻澶辫触"));
e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
}
}
}
--
Gitblit v1.8.0