From 3cb6515f0c99df7d9cb7e998bee70db8fef367cb Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 10 Mar 2022 15:11:10 +0800 Subject: [PATCH] /ChartDataScheduleTest --- .../com/iformall/schedule/ChartDataSchedule.java | 4 ++-- .../com/iformall/schedule/ChartDataScheduleTest.java | 4 ++-- .../iformall/domain/po/base/BaseTenantEntity.java | 2 ++ .../com/iformall/domain/po/base/TenantEntity.java | 2 ++ .../po/base/TenantEntityWithoutFinalTenantId.java | 2 ++ .../com/iformall/domain/po/base/TenantVEntity.java | 2 ++ .../java/com/iformall/mapper/WxCarCmdLogMapper.java | 2 +- .../com/iformall/service/WxCarCmdLogService.java | 2 +- .../service/impl/WxCarCmdLogServiceImpl.java | 12 ++++++------ .../src/main/resources/mapper/WxCarCmdLogMapper.xml | 2 +- 10 files changed, 21 insertions(+), 13 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java index 405f4d8c6..8948d5243 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java @@ -201,8 +201,8 @@ public class ChartDataSchedule { if (count == 0) { logger.info("缴费金额>>>>>>>>>>>>>>>>>>>>>>>>>>"); params.put("cmdTypes", EnumCarCmd.getCarPay()); - BigDecimal fee = wxCarCmdLogService.queryCarPay(params); - addChartData(tenantEntity, fee.toString(), EnumChartType.CAR_PAY_FEE.getCode(), date, createtime); + String fee = wxCarCmdLogService.queryCarPay(params); + addChartData(tenantEntity, fee, EnumChartType.CAR_PAY_FEE.getCode(), date, createtime); } // wxChartDataEntity.setType(EnumChartType.CAR_MEMBER.getCode()); // count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataScheduleTest.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataScheduleTest.java index 5995e0297..f0e555dee 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataScheduleTest.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataScheduleTest.java @@ -212,8 +212,8 @@ public class ChartDataScheduleTest { if (count == 0) { logger.info("缴费金额>>>>>>>>>>>>>>>>>>>>>>>>>>"); params.put("cmdTypes", EnumCarCmd.getCarPay()); - BigDecimal fee = wxCarCmdLogService.queryCarPay(params); - addChartData(tenantEntity, fee.toString(), EnumChartType.CAR_PAY_FEE.getCode(), date, createtime); + String fee = wxCarCmdLogService.queryCarPay(params); + addChartData(tenantEntity, fee, EnumChartType.CAR_PAY_FEE.getCode(), date, createtime); } // wxChartDataEntity.setType(EnumChartType.CAR_MEMBER.getCode()); // count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); 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 fd62605bc..2315df672 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,6 +51,7 @@ public class BaseTenantEntity extends BaseEntity { public void updateTenantInfo(TenantEntity info) { tenantId = info.getTenantId(); + parentTenantId = null; if (StringUtils.isNotBlank(info.getParentTenantId())) { parentTenantId = info.getParentTenantId(); } @@ -59,6 +60,7 @@ public class BaseTenantEntity extends BaseEntity { public void updateTenantInfo(BaseTenantEntity info) { tenantId = info.getTenantId(); + parentTenantId = null; if (StringUtils.isNotBlank(info.getParentTenantId())) { parentTenantId = info.getParentTenantId(); } 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 302444e92..3a3146390 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,6 +29,7 @@ public class TenantEntity extends BaseEntity { public void updateTenantInfo(TenantEntity info) { tenantId = info.getTenantId(); + parentTenantId = null; if (StringUtils.isNotBlank(info.getParentTenantId())) { parentTenantId = info.getParentTenantId(); } @@ -37,6 +38,7 @@ public class TenantEntity extends BaseEntity { public void updateTenantInfo(BaseTenantEntity info) { tenantId = info.getTenantId(); + parentTenantId = null; if (StringUtils.isNotBlank(info.getParentTenantId())) { parentTenantId = info.getParentTenantId(); } 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 c6d9db89e..593f9ee9d 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,6 +19,7 @@ public class TenantEntityWithoutFinalTenantId extends BaseEntity { public void updateTenantInfo(TenantEntityWithoutFinalTenantId info) { tenantId = info.getTenantId(); + parentTenantId = null; if (StringUtils.isNotBlank(info.getParentTenantId())) { parentTenantId = info.getParentTenantId(); } @@ -26,6 +27,7 @@ public class TenantEntityWithoutFinalTenantId extends BaseEntity { public void updateTenantInfo(BaseTenantEntity info) { tenantId = info.getTenantId(); + parentTenantId = null; if (StringUtils.isNotBlank(info.getParentTenantId())) { parentTenantId = info.getParentTenantId(); } 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 0d5ee1434..b074ec093 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,6 +27,7 @@ public class TenantVEntity extends BaseEntity { public void updateTenantInfo(TenantEntity info) { tenantId = info.getTenantId(); + parentTenantId = null; if (StringUtils.isNotBlank(info.getParentTenantId())) { parentTenantId = info.getParentTenantId(); } @@ -34,6 +35,7 @@ public class TenantVEntity extends BaseEntity { public void updateTenantInfo(TenantVEntity info) { tenantId = info.getTenantId(); + parentTenantId = null; if (StringUtils.isNotBlank(info.getParentTenantId())) { parentTenantId = info.getParentTenantId(); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java index c8b61a6b9..248621d9e 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java @@ -26,7 +26,7 @@ public interface WxCarCmdLogMapper extends CommonMapper { List> queryTodayCar(WxCarCmdLog wxCarCmdLog); List> queryWeekCarPay(HashMap params); - BigDecimal queryCarPay(HashMap params); + String queryCarPay(HashMap params); List queryForSceneRepotyHistoryCar(HashMap params); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java b/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java index 6dc86ae06..fb35ff9a6 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java @@ -59,5 +59,5 @@ public interface WxCarCmdLogService { long queryHistoryCount(HashMap params); - BigDecimal queryCarPay(HashMap params); + String queryCarPay(HashMap params); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java index 8804aee91..6c41fad28 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java @@ -118,7 +118,7 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { } @Override - public BigDecimal queryCarPay(HashMap params) { + public String queryCarPay(HashMap params) { String tenantId = params.get("tenantId").toString(); String parentTenantId = params.get("parentTenantId") == null?null:params.get("parentTenantId").toString(); TenantEntity tenantEntity = new TenantEntity(); @@ -129,15 +129,15 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { for (TenantEntity te:tenantEntitys) { params.put("tenantId", te.getTenantId()); params.put("parentTenantId", te.getParentTenantId()); - BigDecimal bigDecimal = wxCarCmdLogMapper.queryCarPay(params); - if(bigDecimal == null){ - bigDecimal = new BigDecimal(0); + String bigDecimal = wxCarCmdLogMapper.queryCarPay(params); + if(StringUtils.isNotBlank(bigDecimal)){ + carPay = carPay.add(new BigDecimal(bigDecimal)); } - carPay.add(bigDecimal); + } params.put("tenantId", tenantEntity.getTenantId()); params.put("parentTenantId", tenantEntity.getParentTenantId()); - return carPay; + return carPay.toString(); } diff --git a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml index 177d6cfbc..3a042be55 100644 --- a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml @@ -120,7 +120,7 @@ group by create_time order by create_time - select sum(CONVERT(JSON_EXTRACT(cmd_json,'$.fee'), Decimal(16,2))) fee from wx_car_cmd_log where cmd_type in