| @@ -201,8 +201,8 @@ public class ChartDataSchedule { | |||||
| if (count == 0) { | if (count == 0) { | ||||
| logger.info("缴费金额>>>>>>>>>>>>>>>>>>>>>>>>>>"); | logger.info("缴费金额>>>>>>>>>>>>>>>>>>>>>>>>>>"); | ||||
| params.put("cmdTypes", EnumCarCmd.getCarPay()); | 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()); | // wxChartDataEntity.setType(EnumChartType.CAR_MEMBER.getCode()); | ||||
| // count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); | // count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); | ||||
| @@ -212,8 +212,8 @@ public class ChartDataScheduleTest { | |||||
| if (count == 0) { | if (count == 0) { | ||||
| logger.info("缴费金额>>>>>>>>>>>>>>>>>>>>>>>>>>"); | logger.info("缴费金额>>>>>>>>>>>>>>>>>>>>>>>>>>"); | ||||
| params.put("cmdTypes", EnumCarCmd.getCarPay()); | 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()); | // wxChartDataEntity.setType(EnumChartType.CAR_MEMBER.getCode()); | ||||
| // count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); | // count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); | ||||
| @@ -51,6 +51,7 @@ 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(); | ||||
| } | } | ||||
| @@ -59,6 +60,7 @@ public class BaseTenantEntity extends BaseEntity { | |||||
| 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(); | ||||
| } | } | ||||
| @@ -29,6 +29,7 @@ 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(); | ||||
| } | } | ||||
| @@ -37,6 +38,7 @@ public class TenantEntity extends BaseEntity { | |||||
| 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(); | ||||
| } | } | ||||
| @@ -19,6 +19,7 @@ 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(); | ||||
| } | } | ||||
| @@ -26,6 +27,7 @@ public class TenantEntityWithoutFinalTenantId extends BaseEntity { | |||||
| 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(); | ||||
| } | } | ||||
| @@ -27,6 +27,7 @@ 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(); | ||||
| } | } | ||||
| @@ -34,6 +35,7 @@ public class TenantVEntity extends BaseEntity { | |||||
| 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(); | ||||
| } | } | ||||
| @@ -26,7 +26,7 @@ public interface WxCarCmdLogMapper extends CommonMapper<WxCarCmdLog, Long> { | |||||
| List<Map<String, Object>> queryTodayCar(WxCarCmdLog wxCarCmdLog); | List<Map<String, Object>> queryTodayCar(WxCarCmdLog wxCarCmdLog); | ||||
| List<Map<String, Object>> queryWeekCarPay(HashMap<String,Object> params); | List<Map<String, Object>> queryWeekCarPay(HashMap<String,Object> params); | ||||
| BigDecimal queryCarPay(HashMap<String,Object> params); | |||||
| String queryCarPay(HashMap<String,Object> params); | |||||
| List<MarkingSceneDataVo> queryForSceneRepotyHistoryCar(HashMap<String,Object> params); | List<MarkingSceneDataVo> queryForSceneRepotyHistoryCar(HashMap<String,Object> params); | ||||
| @@ -59,5 +59,5 @@ public interface WxCarCmdLogService { | |||||
| long queryHistoryCount(HashMap<String, Object> params); | long queryHistoryCount(HashMap<String, Object> params); | ||||
| BigDecimal queryCarPay(HashMap<String, Object> params); | |||||
| String queryCarPay(HashMap<String, Object> params); | |||||
| } | } | ||||
| @@ -118,7 +118,7 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public BigDecimal queryCarPay(HashMap<String, Object> params) { | |||||
| public String queryCarPay(HashMap<String, Object> params) { | |||||
| String tenantId = params.get("tenantId").toString(); | String tenantId = params.get("tenantId").toString(); | ||||
| String parentTenantId = params.get("parentTenantId") == null?null:params.get("parentTenantId").toString(); | String parentTenantId = params.get("parentTenantId") == null?null:params.get("parentTenantId").toString(); | ||||
| TenantEntity tenantEntity = new TenantEntity(); | TenantEntity tenantEntity = new TenantEntity(); | ||||
| @@ -129,15 +129,15 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { | |||||
| for (TenantEntity te:tenantEntitys) { | for (TenantEntity te:tenantEntitys) { | ||||
| params.put("tenantId", te.getTenantId()); | params.put("tenantId", te.getTenantId()); | ||||
| params.put("parentTenantId", te.getParentTenantId()); | 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("tenantId", tenantEntity.getTenantId()); | ||||
| params.put("parentTenantId", tenantEntity.getParentTenantId()); | params.put("parentTenantId", tenantEntity.getParentTenantId()); | ||||
| return carPay; | |||||
| return carPay.toString(); | |||||
| } | } | ||||
| @@ -120,7 +120,7 @@ | |||||
| group by create_time order by create_time | group by create_time order by create_time | ||||
| </select> | </select> | ||||
| <select id="queryCarPay" resultType="BigDecimal" parameterType="hashmap"> | |||||
| <select id="queryCarPay" resultType="String" parameterType="hashmap"> | |||||
| select sum(CONVERT(JSON_EXTRACT(cmd_json,'$.fee'), Decimal(16,2))) fee | select sum(CONVERT(JSON_EXTRACT(cmd_json,'$.fee'), Decimal(16,2))) fee | ||||
| from wx_car_cmd_log | from wx_car_cmd_log | ||||
| where cmd_type in | where cmd_type in | ||||