Browse Source

[电表管理][修改][查询商户及定时任务]

release_toaliyun_real
gongbiao 6 years ago
parent
commit
af2dbba390
6 changed files with 8 additions and 7 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java
  2. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java
  5. +2
    -2
      mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java
  6. +1
    -0
      mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java View File

@@ -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()));
}

}

+ 2
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java View File

@@ -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);
}
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java View File

@@ -21,6 +21,6 @@ public interface KwMerchantMeterMapper extends CommonMapper<KwMerchantMeter, Lon
int unbindBatch(@Param("merchantId")Long merchantId);
int unbind(@Param("meterId")Long meterId);

List<MerchantMeterVo> getMerchantMeter();
List<MerchantMeterVo> getMerchantMeter(String tenantId);

}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java View File

@@ -54,7 +54,7 @@ public interface KwMerchantMeterService {
int unbind(Long meterId);
int unbindBatch(Long merchantId);

List<MerchantMeterVo> getMerchantMeter();
List<MerchantMeterVo> getMerchantMeter(String tenantId);


}

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java View File

@@ -87,8 +87,8 @@ public class KwMerchantMeterServiceImpl implements KwMerchantMeterService {
}

@Override
public List<MerchantMeterVo> getMerchantMeter() {
return kwMerchantMeterMapper.getMerchantMeter();
public List<MerchantMeterVo> getMerchantMeter(String tenantId) {
return kwMerchantMeterMapper.getMerchantMeter(tenantId);
}

}

+ 1
- 0
mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml View File

@@ -278,6 +278,7 @@
<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
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>

</mapper>

Loading…
Cancel
Save