From af2dbba390cd3eba10138e6f4e04bc4c22dfd356 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 21 Aug 2019 13:54:38 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E5=95=86=E6=88=B7?= =?UTF-8?q?=E5=8F=8A=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/device/KwMerchantMeterController.java | 2 +- .../com/iformall/schedule/PowerBillAutoBuildSchedule.java | 4 ++-- .../main/java/com/iformall/mapper/KwMerchantMeterMapper.java | 2 +- .../java/com/iformall/service/kw/KwMerchantMeterService.java | 2 +- .../iformall/service/kw/impl/KwMerchantMeterServiceImpl.java | 4 ++-- .../src/main/resources/mapper/KwMerchantMeterMapper.xml | 1 + 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java index cb96c9c32..246f5baa0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java @@ -106,7 +106,7 @@ public class KwMerchantMeterController extends BaseController { @GetMapping("getMechantMeter") @SystemControllerLog(description = "商户列表") public ResultData getMechantMeter() { - return new ResultData(kwMerchantMeterService.getMerchantMeter()); + return new ResultData(kwMerchantMeterService.getMerchantMeter(getTenantId())); } } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java index 0456512f6..a0696da11 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java @@ -59,7 +59,7 @@ public class PowerBillAutoBuildSchedule { /** * 每天5点执行 */ - @Scheduled(cron = "0 0 5 * * ?") + @Scheduled(cron = "0 49 13 * * ?") public void powerBillAutoConfigStart() { logger.info("自动生成电费账单开始...."); int dayOfMonth = LocalDate.now().getDayOfMonth(); @@ -70,7 +70,7 @@ public class PowerBillAutoBuildSchedule { .collect(Collectors.toList()); for (int i = 0; i < wxPowerBillAutoConfigs.size(); i++) { WxPowerBillAutoConfig wxPowerBillAutoConfig = wxPowerBillAutoConfigs.get(i); - if (wxPowerBillAutoConfig.getBuildDay().equals(dayOfMonth)) { + if (String.valueOf(dayOfMonth).equals(wxPowerBillAutoConfig.getBuildDay())) { merchantPowerBillConfigStart(wxPowerBillAutoConfig); } } diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java index 910cf1038..9e4bbeef6 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java @@ -21,6 +21,6 @@ public interface KwMerchantMeterMapper extends CommonMapper getMerchantMeter(); + List getMerchantMeter(String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java index c068f6d64..aba7178de 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java @@ -54,7 +54,7 @@ public interface KwMerchantMeterService { int unbind(Long meterId); int unbindBatch(Long merchantId); - List getMerchantMeter(); + List getMerchantMeter(String tenantId); } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java index 7683d6882..04b1b0f22 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java @@ -87,8 +87,8 @@ public class KwMerchantMeterServiceImpl implements KwMerchantMeterService { } @Override - public List getMerchantMeter() { - return kwMerchantMeterMapper.getMerchantMeter(); + public List getMerchantMeter(String tenantId) { + return kwMerchantMeterMapper.getMerchantMeter(tenantId); } } diff --git a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml index 7c1b7d2ba..6914819b4 100644 --- a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml @@ -278,6 +278,7 @@