Browse Source

/ChartDataScheduleTest

release_toaliyun_real
xhxu 4 years ago
parent
commit
808a28abdd
7 changed files with 24 additions and 16 deletions
  1. +4
    -4
      mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataScheduleTest.java
  2. +4
    -2
      mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java
  3. +5
    -3
      mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java
  4. +4
    -2
      mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntityWithoutFinalTenantId.java
  5. +4
    -2
      mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  7. +2
    -2
      mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml

+ 4
- 4
mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataScheduleTest.java View File

@@ -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();
}



+ 4
- 2
mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java View File

@@ -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();
}


+ 5
- 3
mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java View File

@@ -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();
}


+ 4
- 2
mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntityWithoutFinalTenantId.java View File

@@ -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;
}
}



+ 4
- 2
mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java View File

@@ -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;
}
}



+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java View File

@@ -1004,7 +1004,7 @@ public class WxChartServiceImpl implements WxChartDataService {
private ResultData getCarHistoryAndTodayAndHB(TenantEntity tenantEntity, boolean withOthers ) {
HashMap<String, Object> 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);


+ 2
- 2
mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml View File

@@ -188,9 +188,9 @@
<select id="findSumMoney" parameterType="com.iformall.domain.po.WxMerchantTradeDaily" resultType="String">
select IFNULL(sum(mtd.trade_amt),0)
from wx_merchant_trade_daily mtd
where mtd`tenant_id` = #{tenantId}
where mtd.`tenant_id` = #{tenantId}
<if test=" null != parentTenantId and '' != parentTenantId">
and mtd`parent_tenant_id` = #{parentTenantId}
and mtd.`parent_tenant_id` = #{parentTenantId}
</if>

<if test=" null != merchantId ">


Loading…
Cancel
Save