From c2e3dea0d75b7239b1ed66c9d9e1bbb177050858 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 29 六月 2020 13:57:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountOrderServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 06f9e31..d1a552b 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
@@ -138,7 +138,7 @@
if (min <= 10) { // 10鍒嗛挓浠ュ唴涓嶇粺璁�
return;
}
-
+
Date today = new Date();
int betweenDays = DateUtil.daysBetween2(lastDate, today);
for (int i = 0; i <= betweenDays; i++) {
@@ -296,7 +296,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