From d5c2554ebae75afbff31c3c2966cc3a747ba941c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 27 四月 2020 15:00:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountOrderServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountOrderServiceImpl.java
index 61b94a3..355c912 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountOrderServiceImpl.java
@@ -124,7 +124,8 @@
* @param typeEnum
* @throws Exception
*/
- private void initData(DailyCountOrderEnum typeEnum) throws Exception {
+ @Override
+ public void initData(DailyCountOrderEnum typeEnum) throws Exception {
Date lastDate = null;
DailyCountOrder lastRecord = dailyCountOrderDao.getMaxDate(typeEnum);
if (lastRecord != null) {
@@ -133,11 +134,13 @@
lastDate = TimeUtil.parse("2018-01-20");
}
- long min = DateUtil.dateDiffMin(lastDate, new Date());
- if (min <= 10) { // 10鍒嗛挓浠ュ唴涓嶇粺璁�
- return;
- }
-
+// long min = DateUtil.dateDiffMin(lastDate, new Date());
+// if (min <= 10) { // 10鍒嗛挓浠ュ唴涓嶇粺璁�
+// return;
+// }
+
+ lastDate = TimeUtil.parse("2019-10-01");
+
Date today = new Date();
int betweenDays = DateUtil.daysBetween2(lastDate, today);
for (int i = 0; i <= betweenDays; i++) {
@@ -295,7 +298,7 @@
* @param typeEnum
* @throws Exception
*/
- private void addChannelOrderMoney(String preDay, DailyCountOrderEnum typeEnum) throws Exception {
+ public void addChannelOrderMoney(String preDay, DailyCountOrderEnum typeEnum) throws Exception {
List<UserInfoRegister> listRegister = null;
// 鏌ヨ璁㈠崟浣ｉ噾
List<CountOrderDTO> listOrder = commonOrderCountService.countCommissionByDay(preDay);
--
Gitblit v1.8.0