| @@ -106,7 +106,7 @@ public class KwMerchantMeterController extends BaseController { | |||||
| @GetMapping("getMechantMeter") | @GetMapping("getMechantMeter") | ||||
| @SystemControllerLog(description = "商户列表") | @SystemControllerLog(description = "商户列表") | ||||
| public ResultData getMechantMeter() { | public ResultData getMechantMeter() { | ||||
| return new ResultData(kwMerchantMeterService.getMerchantMeter()); | |||||
| return new ResultData(kwMerchantMeterService.getMerchantMeter(getTenantId())); | |||||
| } | } | ||||
| } | } | ||||
| @@ -59,7 +59,7 @@ public class PowerBillAutoBuildSchedule { | |||||
| /** | /** | ||||
| * 每天5点执行 | * 每天5点执行 | ||||
| */ | */ | ||||
| @Scheduled(cron = "0 0 5 * * ?") | |||||
| @Scheduled(cron = "0 49 13 * * ?") | |||||
| public void powerBillAutoConfigStart() { | public void powerBillAutoConfigStart() { | ||||
| logger.info("自动生成电费账单开始...."); | logger.info("自动生成电费账单开始...."); | ||||
| int dayOfMonth = LocalDate.now().getDayOfMonth(); | int dayOfMonth = LocalDate.now().getDayOfMonth(); | ||||
| @@ -70,7 +70,7 @@ public class PowerBillAutoBuildSchedule { | |||||
| .collect(Collectors.toList()); | .collect(Collectors.toList()); | ||||
| for (int i = 0; i < wxPowerBillAutoConfigs.size(); i++) { | for (int i = 0; i < wxPowerBillAutoConfigs.size(); i++) { | ||||
| WxPowerBillAutoConfig wxPowerBillAutoConfig = wxPowerBillAutoConfigs.get(i); | WxPowerBillAutoConfig wxPowerBillAutoConfig = wxPowerBillAutoConfigs.get(i); | ||||
| if (wxPowerBillAutoConfig.getBuildDay().equals(dayOfMonth)) { | |||||
| if (String.valueOf(dayOfMonth).equals(wxPowerBillAutoConfig.getBuildDay())) { | |||||
| merchantPowerBillConfigStart(wxPowerBillAutoConfig); | merchantPowerBillConfigStart(wxPowerBillAutoConfig); | ||||
| } | } | ||||
| } | } | ||||
| @@ -21,6 +21,6 @@ public interface KwMerchantMeterMapper extends CommonMapper<KwMerchantMeter, Lon | |||||
| int unbindBatch(@Param("merchantId")Long merchantId); | int unbindBatch(@Param("merchantId")Long merchantId); | ||||
| int unbind(@Param("meterId")Long meterId); | int unbind(@Param("meterId")Long meterId); | ||||
| List<MerchantMeterVo> getMerchantMeter(); | |||||
| List<MerchantMeterVo> getMerchantMeter(String tenantId); | |||||
| } | } | ||||
| @@ -54,7 +54,7 @@ public interface KwMerchantMeterService { | |||||
| int unbind(Long meterId); | int unbind(Long meterId); | ||||
| int unbindBatch(Long merchantId); | int unbindBatch(Long merchantId); | ||||
| List<MerchantMeterVo> getMerchantMeter(); | |||||
| List<MerchantMeterVo> getMerchantMeter(String tenantId); | |||||
| } | } | ||||
| @@ -87,8 +87,8 @@ public class KwMerchantMeterServiceImpl implements KwMerchantMeterService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public List<MerchantMeterVo> getMerchantMeter() { | |||||
| return kwMerchantMeterMapper.getMerchantMeter(); | |||||
| public List<MerchantMeterVo> getMerchantMeter(String tenantId) { | |||||
| return kwMerchantMeterMapper.getMerchantMeter(tenantId); | |||||
| } | } | ||||
| } | } | ||||
| @@ -278,6 +278,7 @@ | |||||
| <select id="getMerchantMeter" resultMap="MerchantMeterMap"> | <select id="getMerchantMeter" resultMap="MerchantMeterMap"> | ||||
| select m.id as merchant_id,m.name as merchant_name,ifnull(mm.status,0) has from wx_merchant m | select m.id as merchant_id,m.name as merchant_name,ifnull(mm.status,0) has from wx_merchant m | ||||
| left join (select merchant_id,1 as status from kw_merchant_meter where status=0) mm on m.id=mm.merchant_id | left join (select merchant_id,1 as status from kw_merchant_meter where status=0) mm on m.id=mm.merchant_id | ||||
| where m.id not in(select merchant_id from wx_merchant_power_bill_config where tenant_id=#{tenantId}) | |||||
| </select> | </select> | ||||
| </mapper> | </mapper> | ||||