| @@ -11,6 +11,7 @@ import com.iformall.mapper.WxMerchantShopMapper; | |||||
| import com.iformall.mapper.WxPowerBillAutoConfigMapper; | import com.iformall.mapper.WxPowerBillAutoConfigMapper; | ||||
| import com.iformall.service.WxBillDailyService; | import com.iformall.service.WxBillDailyService; | ||||
| import com.iformall.service.kw.KwMeterDataService; | import com.iformall.service.kw.KwMeterDataService; | ||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -27,6 +28,7 @@ import java.util.Date; | |||||
| import java.util.HashMap; | import java.util.HashMap; | ||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.Map; | import java.util.Map; | ||||
| import java.util.stream.Collectors; | |||||
| /** | /** | ||||
| * @author gongbiao | * @author gongbiao | ||||
| @@ -61,7 +63,11 @@ public class PowerBillAutoBuildSchedule { | |||||
| public void powerBillAutoConfigStart() { | public void powerBillAutoConfigStart() { | ||||
| logger.info("自动生成电费账单开始...."); | logger.info("自动生成电费账单开始...."); | ||||
| int dayOfMonth = LocalDate.now().getDayOfMonth(); | int dayOfMonth = LocalDate.now().getDayOfMonth(); | ||||
| List<WxPowerBillAutoConfig> wxPowerBillAutoConfigs = wxPowerBillAutoConfigMapper.selectAll(); | |||||
| List<WxPowerBillAutoConfig> wxPowerBillAutoConfigs = wxPowerBillAutoConfigMapper.selectAll() | |||||
| .stream().filter(config -> StringUtils.isNotEmpty(config.getUnitPrice()) | |||||
| && StringUtils.isNotEmpty(config.getBuildDay()) | |||||
| && StringUtils.isNotEmpty(config.getReceiveDay())) | |||||
| .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 (wxPowerBillAutoConfig.getBuildDay().equals(dayOfMonth)) { | ||||