diff --git a/business-service/src/main/java/com/ho/business/controller/OuterApiController.java b/business-service/src/main/java/com/ho/business/controller/OuterApiController.java index a29bfc8..9f9004f 100644 --- a/business-service/src/main/java/com/ho/business/controller/OuterApiController.java +++ b/business-service/src/main/java/com/ho/business/controller/OuterApiController.java @@ -421,7 +421,7 @@ public class OuterApiController { log.info("jobIntegratedCabinet, {}", monitorQuery); outApiService.dayChargeDeal(monitorQuery); outApiService.currentMonthYearDeal(monitorQuery); - outApiService.dayPVCharge(monitorQuery); +// outApiService.dayPVCharge(monitorQuery); return DataResult.success(); } diff --git a/xxl-job/src/main/java/com/ho/xxljob/JobHandler.java b/xxl-job/src/main/java/com/ho/xxljob/JobHandler.java index 97e8cde..62fe8c0 100644 --- a/xxl-job/src/main/java/com/ho/xxljob/JobHandler.java +++ b/xxl-job/src/main/java/com/ho/xxljob/JobHandler.java @@ -166,7 +166,14 @@ public class JobHandler { XxlJobLogger.log("jobEarningsCalculate"); log.info("jobMaintenanceInsert start !"); Date date = DateUtil.addDays(new Date(), -1); - businessFeignClient.jobEarningsCalculate(DateUtil.formatDate(date)); + if(StringUtils.isEmpty(param)){ + System.out.println(DateUtil.formatDate(date)); + businessFeignClient.jobEarningsCalculate(DateUtil.formatDate(date)); + }else{ + System.out.println(param); + businessFeignClient.jobEarningsCalculate(param); + } + log.info("jobMaintenanceInsert end !"); return ReturnT.SUCCESS; }