From bf052072dbce8c74f1eeff6adb4af1c73e94ffce Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 18 五月 2020 14:52:57 +0800
Subject: [PATCH] iso版本改为81
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 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 a2bd60b..44c2e3c 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
@@ -1,6 +1,5 @@
package com.yeshi.fanli.service.impl.order;
-import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -25,13 +24,16 @@
@Override
@RequestSerializableByKeyService(key = "#record.uid")
public void saveDailyCount(OrderMoneyDailyCount record) {
- if (record.getUid() == null || record.getCountDay() == null || record.getSourceType() == null) {
+ if (record.getUid() == null || record.getCountDay() == null) {
return; // 鍙傛暟涓嶅叏
}
String gernalTime = TimeUtil.getGernalTime(record.getCountDay().getTime());
- String id = StringUtil.Md5(record.getUid() + "#" + record.getSourceType().name() + "#" + gernalTime);
+ String id = record.getUid() + "#";
+ if (record.getSourceType() != null)
+ id += record.getSourceType().name() + "#";
+ id += gernalTime;
+ id = StringUtil.Md5(id);
- // id
record.setId(id);
// 缁熻鏃ユ湡-骞存湀鏃�
record.setCountDay(new Date(TimeUtil.convertDateToTemp(gernalTime)));
@@ -66,6 +68,19 @@
record.setTeamSubsidy(0);
if (record.getTeamSubsidyNum() == null)
record.setTeamSubsidyNum(0);
+
+ if (record.getDirectOrderNum() == null)
+ record.setDirectOrderNum(0);
+ if (record.getInDirectOrderNum() == null)
+ record.setInDirectOrderNum(0);
+
+ if (record.getBeyondOrderNum() == null)
+ record.setBeyondOrderNum(0);
+ }
+
+ @Override
+ public List<OrderMoneyDailyCount> getByUid(Long uid) {
+ return orderMoneyDailyCountDao.query(uid, null, null);
}
@Override
@@ -92,8 +107,7 @@
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);
@@ -103,4 +117,21 @@
public List<OrderMoneyDailyCount> sumTeamGroupByYearMonth(Long uid, Date minDay, Date maxDay) {
return orderMoneyDailyCountDao.sumTeamGroupByYearMonth(uid, minDay, maxDay);
}
+
+ @Override
+ public List<OrderMoneyDailyCount> sumTeamOrderNumGroupByCountDay(Long uid, Date minDay, Date maxDay) {
+ return orderMoneyDailyCountDao.sumTeamOrderNumGroupByCountDay(uid, minDay, maxDay);
+ }
+
+ @Override
+ public List<OrderMoneyDailyCount> sumTeamOrderNumGroupByYearMonth(Long uid, Date minDay, Date maxDay) {
+ return orderMoneyDailyCountDao.sumTeamOrderNumGroupByYearMonth(uid, minDay, maxDay);
+ }
+
+
+ @Override
+ public List<OrderMoneyDailyCount> sumTeamOrderNumGroupByUid(Long uid, Date minDay, Date maxDay) {
+ return orderMoneyDailyCountDao.sumTeamOrderNumGroupByUid(uid, minDay, maxDay);
+ }
+
}
--
Gitblit v1.8.0