From 8b3c82c0788e23acd889e6f67a91c855693352fd Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 13 五月 2020 16:38:29 +0800
Subject: [PATCH] 团队分红统计
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java
index 03b9200..a2bd60b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java
@@ -39,24 +39,35 @@
SimpleDateFormat formatMonth = new SimpleDateFormat("yyyy-MM");
record.setYearMonth(formatMonth.format(record.getCountDay()));
- OrderMoneyDailyCount dailyCount = orderMoneyDailyCountDao.getById(id);
+ OrderMoneyDailyCount dailyCount = orderMoneyDailyCountDao.get(id);
if (dailyCount != null) {
- // 閫夋嫨鎬ф洿鏂�
orderMoneyDailyCountDao.updateSelective(record);
} else {
- // 閫夋嫨鎬ф彃鍏�
- if (record.getIncome() == null)
- record.setIncome(BigDecimal.valueOf(0));
- if (record.getIncomeTeam() == null)
- record.setIncomeTeam(BigDecimal.valueOf(0));
- if (record.getOrderNum() == null)
- record.setOrderNum(0);
- if (record.getOrderNumTeam() == null)
- record.setOrderNumTeam(0);
+ initData(record);
+ record.setUpdateTime(new Date());
orderMoneyDailyCountDao.save(record);
}
}
+ private void initData(OrderMoneyDailyCount record) {
+ if (record.getIncome() == null)
+ record.setIncome(0);
+ if (record.getIncomeTeam() == null)
+ record.setIncomeTeam(0);
+ if (record.getOrderNum() == null)
+ record.setOrderNum(0);
+ if (record.getOrderNumTeam() == null)
+ record.setOrderNumTeam(0);
+ if (record.getTeamReward() == null)
+ record.setTeamReward(0);
+ if (record.getTeamRewardNum() == null)
+ record.setTeamRewardNum(0);
+ if (record.getTeamSubsidy() == null)
+ record.setTeamSubsidy(0);
+ if (record.getTeamSubsidyNum() == null)
+ record.setTeamSubsidyNum(0);
+ }
+
@Override
public List<OrderMoneyDailyCount> query(Long uid, Date minDay, Date maxDay) {
return orderMoneyDailyCountDao.query(uid, minDay, maxDay);
@@ -81,4 +92,15 @@
public List<OrderMoneyDailyCount> sumGroupByYearMonth(Long uid, Date minDay, Date maxDay) {
return orderMoneyDailyCountDao.sumGroupByYearMonth(uid, minDay, maxDay);
}
+
+
+ @Override
+ public List<OrderMoneyDailyCount> sumTeamGroupByCountDay(Long uid, Date minDay, Date maxDay) {
+ return orderMoneyDailyCountDao.sumTeamGroupByCountDay(uid, minDay, maxDay);
+ }
+
+ @Override
+ public List<OrderMoneyDailyCount> sumTeamGroupByYearMonth(Long uid, Date minDay, Date maxDay) {
+ return orderMoneyDailyCountDao.sumTeamGroupByYearMonth(uid, minDay, maxDay);
+ }
}
--
Gitblit v1.8.0