| @@ -66,11 +66,11 @@ public class ChartDataScheduleTest { | |||||
| private CUserServiceFactory cuserFactory; | private CUserServiceFactory cuserFactory; | ||||
| @Async | @Async | ||||
| @Scheduled(cron = "0 30 15 10 3 ?") | |||||
| @Scheduled(cron = "0 10 17 10 3 ?") | |||||
| public void testCreateData() { | public void testCreateData() { | ||||
| createUserData(); | |||||
| createCarData(); | |||||
| createSaleData(); | |||||
| // createUserData(); | |||||
| // createCarData(); | |||||
| // createSaleData(); | |||||
| createMerchantTradeData(); | createMerchantTradeData(); | ||||
| } | } | ||||
| @@ -51,18 +51,20 @@ public class BaseTenantEntity extends BaseEntity { | |||||
| public void updateTenantInfo(TenantEntity info) { | public void updateTenantInfo(TenantEntity info) { | ||||
| tenantId = info.getTenantId(); | tenantId = info.getTenantId(); | ||||
| parentTenantId = null; | |||||
| if (StringUtils.isNotBlank(info.getParentTenantId())) { | if (StringUtils.isNotBlank(info.getParentTenantId())) { | ||||
| parentTenantId = info.getParentTenantId(); | parentTenantId = info.getParentTenantId(); | ||||
| }else{ | |||||
| parentTenantId = null; | |||||
| } | } | ||||
| getFinalTenantId(); | getFinalTenantId(); | ||||
| } | } | ||||
| public void updateTenantInfo(BaseTenantEntity info) { | public void updateTenantInfo(BaseTenantEntity info) { | ||||
| tenantId = info.getTenantId(); | tenantId = info.getTenantId(); | ||||
| parentTenantId = null; | |||||
| if (StringUtils.isNotBlank(info.getParentTenantId())) { | if (StringUtils.isNotBlank(info.getParentTenantId())) { | ||||
| parentTenantId = info.getParentTenantId(); | parentTenantId = info.getParentTenantId(); | ||||
| }else{ | |||||
| parentTenantId = null; | |||||
| } | } | ||||
| getFinalTenantId(); | getFinalTenantId(); | ||||
| } | } | ||||
| @@ -29,18 +29,20 @@ public class TenantEntity extends BaseEntity { | |||||
| public void updateTenantInfo(TenantEntity info) { | public void updateTenantInfo(TenantEntity info) { | ||||
| tenantId = info.getTenantId(); | tenantId = info.getTenantId(); | ||||
| parentTenantId = null; | |||||
| if (StringUtils.isNotBlank(info.getParentTenantId())) { | if (StringUtils.isNotBlank(info.getParentTenantId())) { | ||||
| parentTenantId = info.getParentTenantId(); | parentTenantId = info.getParentTenantId(); | ||||
| } | |||||
| }else{ | |||||
| parentTenantId = null; | |||||
| } | |||||
| getFinalTenantId(); | getFinalTenantId(); | ||||
| } | } | ||||
| public void updateTenantInfo(BaseTenantEntity info) { | public void updateTenantInfo(BaseTenantEntity info) { | ||||
| tenantId = info.getTenantId(); | tenantId = info.getTenantId(); | ||||
| parentTenantId = null; | |||||
| if (StringUtils.isNotBlank(info.getParentTenantId())) { | if (StringUtils.isNotBlank(info.getParentTenantId())) { | ||||
| parentTenantId = info.getParentTenantId(); | parentTenantId = info.getParentTenantId(); | ||||
| }else{ | |||||
| parentTenantId = null; | |||||
| } | } | ||||
| getFinalTenantId(); | getFinalTenantId(); | ||||
| } | } | ||||
| @@ -19,17 +19,19 @@ public class TenantEntityWithoutFinalTenantId extends BaseEntity { | |||||
| public void updateTenantInfo(TenantEntityWithoutFinalTenantId info) { | public void updateTenantInfo(TenantEntityWithoutFinalTenantId info) { | ||||
| tenantId = info.getTenantId(); | tenantId = info.getTenantId(); | ||||
| parentTenantId = null; | |||||
| if (StringUtils.isNotBlank(info.getParentTenantId())) { | if (StringUtils.isNotBlank(info.getParentTenantId())) { | ||||
| parentTenantId = info.getParentTenantId(); | parentTenantId = info.getParentTenantId(); | ||||
| }else{ | |||||
| parentTenantId = null; | |||||
| } | } | ||||
| } | } | ||||
| public void updateTenantInfo(BaseTenantEntity info) { | public void updateTenantInfo(BaseTenantEntity info) { | ||||
| tenantId = info.getTenantId(); | tenantId = info.getTenantId(); | ||||
| parentTenantId = null; | |||||
| if (StringUtils.isNotBlank(info.getParentTenantId())) { | if (StringUtils.isNotBlank(info.getParentTenantId())) { | ||||
| parentTenantId = info.getParentTenantId(); | parentTenantId = info.getParentTenantId(); | ||||
| }else{ | |||||
| parentTenantId = null; | |||||
| } | } | ||||
| } | } | ||||
| @@ -27,17 +27,19 @@ public class TenantVEntity extends BaseEntity { | |||||
| public void updateTenantInfo(TenantEntity info) { | public void updateTenantInfo(TenantEntity info) { | ||||
| tenantId = info.getTenantId(); | tenantId = info.getTenantId(); | ||||
| parentTenantId = null; | |||||
| if (StringUtils.isNotBlank(info.getParentTenantId())) { | if (StringUtils.isNotBlank(info.getParentTenantId())) { | ||||
| parentTenantId = info.getParentTenantId(); | parentTenantId = info.getParentTenantId(); | ||||
| }else{ | |||||
| parentTenantId = null; | |||||
| } | } | ||||
| } | } | ||||
| public void updateTenantInfo(TenantVEntity info) { | public void updateTenantInfo(TenantVEntity info) { | ||||
| tenantId = info.getTenantId(); | tenantId = info.getTenantId(); | ||||
| parentTenantId = null; | |||||
| if (StringUtils.isNotBlank(info.getParentTenantId())) { | if (StringUtils.isNotBlank(info.getParentTenantId())) { | ||||
| parentTenantId = info.getParentTenantId(); | parentTenantId = info.getParentTenantId(); | ||||
| }else{ | |||||
| parentTenantId = null; | |||||
| } | } | ||||
| } | } | ||||
| @@ -1004,7 +1004,7 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| private ResultData getCarHistoryAndTodayAndHB(TenantEntity tenantEntity, boolean withOthers ) { | private ResultData getCarHistoryAndTodayAndHB(TenantEntity tenantEntity, boolean withOthers ) { | ||||
| HashMap<String, Object> datamap = new HashMap<>(); | HashMap<String, Object> datamap = new HashMap<>(); | ||||
| String startdate = DateUtils.getTimeBefore(30, new Date()); | 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(); | WxChartDataEntity chartData = new WxChartDataEntity(); | ||||
| chartData.updateTenantInfo(tenantEntity); | chartData.updateTenantInfo(tenantEntity); | ||||
| @@ -188,9 +188,9 @@ | |||||
| <select id="findSumMoney" parameterType="com.iformall.domain.po.WxMerchantTradeDaily" resultType="String"> | <select id="findSumMoney" parameterType="com.iformall.domain.po.WxMerchantTradeDaily" resultType="String"> | ||||
| select IFNULL(sum(mtd.trade_amt),0) | select IFNULL(sum(mtd.trade_amt),0) | ||||
| from wx_merchant_trade_daily mtd | from wx_merchant_trade_daily mtd | ||||
| where mtd`tenant_id` = #{tenantId} | |||||
| where mtd.`tenant_id` = #{tenantId} | |||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | <if test=" null != parentTenantId and '' != parentTenantId"> | ||||
| and mtd`parent_tenant_id` = #{parentTenantId} | |||||
| and mtd.`parent_tenant_id` = #{parentTenantId} | |||||
| </if> | </if> | ||||
| <if test=" null != merchantId "> | <if test=" null != merchantId "> | ||||