From 808a28abdd90760c76434af85a6a6878d2e5aea7 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 10 Mar 2022 16:53:46 +0800 Subject: [PATCH] /ChartDataScheduleTest --- .../java/com/iformall/schedule/ChartDataScheduleTest.java | 8 ++++---- .../com/iformall/domain/po/base/BaseTenantEntity.java | 6 ++++-- .../java/com/iformall/domain/po/base/TenantEntity.java | 8 +++++--- .../domain/po/base/TenantEntityWithoutFinalTenantId.java | 6 ++++-- .../java/com/iformall/domain/po/base/TenantVEntity.java | 6 ++++-- .../com/iformall/service/impl/WxChartServiceImpl.java | 2 +- .../main/resources/mapper/WxMerchantTradeDailyMapper.xml | 4 ++-- 7 files changed, 24 insertions(+), 16 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataScheduleTest.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataScheduleTest.java index f6e2fbd63..f947741bc 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataScheduleTest.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataScheduleTest.java @@ -66,11 +66,11 @@ public class ChartDataScheduleTest { private CUserServiceFactory cuserFactory; @Async - @Scheduled(cron = "0 30 15 10 3 ?") + @Scheduled(cron = "0 10 17 10 3 ?") public void testCreateData() { - createUserData(); - createCarData(); - createSaleData(); +// createUserData(); +// createCarData(); +// createSaleData(); createMerchantTradeData(); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java index 2315df672..175549f43 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java @@ -51,18 +51,20 @@ public class BaseTenantEntity extends BaseEntity { public void updateTenantInfo(TenantEntity info) { tenantId = info.getTenantId(); - parentTenantId = null; if (StringUtils.isNotBlank(info.getParentTenantId())) { parentTenantId = info.getParentTenantId(); + }else{ + parentTenantId = null; } getFinalTenantId(); } public void updateTenantInfo(BaseTenantEntity info) { tenantId = info.getTenantId(); - parentTenantId = null; if (StringUtils.isNotBlank(info.getParentTenantId())) { parentTenantId = info.getParentTenantId(); + }else{ + parentTenantId = null; } getFinalTenantId(); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java index 3a3146390..b4e3e2bc4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java @@ -29,18 +29,20 @@ public class TenantEntity extends BaseEntity { public void updateTenantInfo(TenantEntity info) { tenantId = info.getTenantId(); - parentTenantId = null; if (StringUtils.isNotBlank(info.getParentTenantId())) { parentTenantId = info.getParentTenantId(); - } + }else{ + parentTenantId = null; + } getFinalTenantId(); } public void updateTenantInfo(BaseTenantEntity info) { tenantId = info.getTenantId(); - parentTenantId = null; if (StringUtils.isNotBlank(info.getParentTenantId())) { parentTenantId = info.getParentTenantId(); + }else{ + parentTenantId = null; } getFinalTenantId(); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntityWithoutFinalTenantId.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntityWithoutFinalTenantId.java index 593f9ee9d..76fb3ea3d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntityWithoutFinalTenantId.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntityWithoutFinalTenantId.java @@ -19,17 +19,19 @@ public class TenantEntityWithoutFinalTenantId extends BaseEntity { public void updateTenantInfo(TenantEntityWithoutFinalTenantId info) { tenantId = info.getTenantId(); - parentTenantId = null; if (StringUtils.isNotBlank(info.getParentTenantId())) { parentTenantId = info.getParentTenantId(); + }else{ + parentTenantId = null; } } public void updateTenantInfo(BaseTenantEntity info) { tenantId = info.getTenantId(); - parentTenantId = null; if (StringUtils.isNotBlank(info.getParentTenantId())) { parentTenantId = info.getParentTenantId(); + }else{ + parentTenantId = null; } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java index b074ec093..b84de9620 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java @@ -27,17 +27,19 @@ public class TenantVEntity extends BaseEntity { public void updateTenantInfo(TenantEntity info) { tenantId = info.getTenantId(); - parentTenantId = null; if (StringUtils.isNotBlank(info.getParentTenantId())) { parentTenantId = info.getParentTenantId(); + }else{ + parentTenantId = null; } } public void updateTenantInfo(TenantVEntity info) { tenantId = info.getTenantId(); - parentTenantId = null; if (StringUtils.isNotBlank(info.getParentTenantId())) { parentTenantId = info.getParentTenantId(); + }else{ + parentTenantId = null; } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 707566973..ff8aa3246 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -1004,7 +1004,7 @@ public class WxChartServiceImpl implements WxChartDataService { private ResultData getCarHistoryAndTodayAndHB(TenantEntity tenantEntity, boolean withOthers ) { HashMap datamap = new HashMap<>(); String startdate = DateUtils.getTimeBefore(30, new Date()); - String enddate = DateUtils.getSystemTime("yyyy-MM-dd"); + String enddate = DateUtils.getTimeBefore(1, new Date()); WxChartDataEntity chartData = new WxChartDataEntity(); chartData.updateTenantInfo(tenantEntity); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml index 00ad53065..126cf18b7 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml @@ -188,9 +188,9 @@