修改bug

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/quartz/job/EstimateMsgSendJob.java

@@ -25,13 +25,12 @@ public class EstimateMsgSendJob implements Job, Serializable {
         // 1,获取推送配置信息
         JobDetail jobDetail = context.getJobDetail();
         JobDataMap jobDataMap = jobDetail.getJobDataMap();
-        Integer siteId = Integer.valueOf(jobDataMap.get("siteId").toString());
-        Integer customerId = Integer.valueOf(jobDataMap.get("customerId").toString());
+
         String tenantId=jobDataMap.get("tenantId").toString();
 
         // 2,调用推送方法
-        log.info("invoke EstimateMsgSendJob , customerId = {}",customerId);
+        log.info("invoke EstimateMsgSendJob , customerId = {}",tenantId);
         estimateMsgSendService.send(tenantId);
-        log.info("invoked EstimateMsgSendJob , customerId = {}",customerId);
+        log.info("invoked EstimateMsgSendJob , customerId = {}",tenantId);
     }
 }

zoniot-pay/zoniot-pay-xxljob-client/src/main/java/com/zcxk/rmcp/pay/job/EstimatedDayHander.java

@@ -7,12 +7,14 @@ import com.zcxk.rmcp.pay.dao.pay.*;
 import com.zcxk.rmcp.pay.dao.pay.archives.PayBaseCustomerandmeterrelaMapper;
 import com.zcxk.rmcp.pay.dto.pay.*;
 import com.zcxk.rmcp.pay.entity.pay.BaseWaterProperty;
+import com.zcxk.rmcp.pay.entity.pay.MeasurementRecord;
 import com.zcxk.rmcp.pay.entity.pay.PayBaseAccount;
 import com.zcxk.rmcp.pay.entity.pay.PayBaseWaterprice;
 import com.zcxk.rmcp.pay.entity.pay.archives.PayBaseCustomerandmeterrela;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.Validate;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.lang.reflect.Field;
@@ -47,6 +49,7 @@ public class EstimatedDayHander {
     private AmountWaterUsedAmountMapper amountWaterUsedAmountMapper;
     @Resource
     private PayPayReceivableMapper payPayReceivableMapper;
+    @Resource MeasurementRecordMapper measurementRecordMapper;
 
     @XxlJob("estimatedDayHander")
     public ReturnT<String> execute(String info){
@@ -232,9 +235,10 @@ public class EstimatedDayHander {
 
         //月阶梯用户 新安装户相差天数>31天或者跨账期结算则非阶梯结算
         if(isEnable>=1){
-            List<AmountWaterUsedAmountDto> amountWaterUsedAmounts = amountWaterUsedAmountMapper.getWaterUsedAmountByMeterId(watermeterId);
-            if(amountWaterUsedAmounts!=null && amountWaterUsedAmounts.size()>0){
-                AmountWaterUsedAmountDto theLastOne = null;
+            List<MeasurementRecord> amountWaterUsedAmounts = measurementRecordMapper.
+                    getWaterUsedAmountByMeterId(watermeterId.longValue());
+            if(!CollectionUtils.isEmpty(amountWaterUsedAmounts)){
+                MeasurementRecord theLastOne = null;
                 if(amountWaterUsedAmounts.size()>1){
                     //取最后一次已审核
                     theLastOne = amountWaterUsedAmounts.get(1);
@@ -254,7 +258,7 @@ public class EstimatedDayHander {
                 }else{
                     //新安装户,取安装时间比较
                     theLastOne = amountWaterUsedAmounts.get(0);
-                    Date createDate = theLastOne.getInstalldate();
+                    Date createDate = theLastOne.getCreateDate();
                     if(createDate!=null) {
                         Double sDay = DateUtil.getDistanceOfTwoDate(createDate, new Date());
                         if (sDay > 31) {
@@ -262,8 +266,7 @@ public class EstimatedDayHander {
                         }
                     }else{
                         isEnable = 2;//异常
-                       /* ajaxMessage.setMsg(-701,"水表设备"+amountWaterUsedAmount.getMetercode()+"安装时间为空");
-                        return ajaxMessage;*/
+
                     }
                 }
             }