From fb885c8bff26484f2bb21e697f182cc35bc4fa63 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 12 五月 2020 15:27:08 +0800
Subject: [PATCH] 2.1.1 新需求
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneyDailyCountServiceImpl.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 a3c283e..24370d2 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,5 +1,6 @@
package com.yeshi.fanli.service.impl.order;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -24,16 +25,19 @@
@Override
@RequestSerializableByKeyService(key = "#record.uid")
public void saveDailyCount(OrderMoneyDailyCount record) {
- if (record.getUid() == null || record.getCountDay() == null || StringUtil.isNullOrEmpty(record.getSourceType())) {
+ if (record.getUid() == null || record.getCountDay() == null || record.getSourceType() == null) {
return; // 鍙傛暟涓嶅叏
}
String gernalTime = TimeUtil.getGernalTime(record.getCountDay().getTime());
- String id = StringUtil.Md5(record.getUid() + record.getSourceType() + gernalTime);
+ String id = StringUtil.Md5(record.getUid() + record.getSourceType().name() + gernalTime);
// id
record.setId(id);
// 缁熻鏃ユ湡-骞存湀鏃�
record.setCountDay(new Date(TimeUtil.convertDateToTemp(gernalTime)));
+
+ SimpleDateFormat formatMonth = new SimpleDateFormat("yyyy-MM");
+ record.setYearMonth(formatMonth.format(record.getCountDay()) );
OrderMoneyDailyCount dailyCount = orderMoneyDailyCountDao.getById(id);
if (dailyCount == null) {
@@ -50,4 +54,23 @@
return orderMoneyDailyCountDao.query(uid, minDay, maxDay);
}
+ @Override
+ public List<OrderMoneyDailyCount> sumGroupBySourceType(Long uid, Date minDay, Date maxDay) {
+ return orderMoneyDailyCountDao.sumGroupBySourceType(uid, minDay, maxDay);
+ }
+
+ @Override
+ public List<OrderMoneyDailyCount> sumTeamGroupBySourceType(Long uid, Date minDay, Date maxDay) {
+ return orderMoneyDailyCountDao.sumTeamGroupBySourceType(uid, minDay, maxDay);
+ }
+
+ @Override
+ public List<OrderMoneyDailyCount> sumGroupByCountDay(Long uid, Date minDay, Date maxDay) {
+ return orderMoneyDailyCountDao.sumGroupByCountDay(uid, minDay, maxDay);
+ }
+
+ @Override
+ public List<OrderMoneyDailyCount> sumGroupByYearMonth(Long uid, Date minDay, Date maxDay) {
+ return orderMoneyDailyCountDao.sumGroupByYearMonth(uid, minDay, maxDay);
+ }
}
--
Gitblit v1.8.0