更改判断条件

src/main/java/com/zoniot/ccrc/scheduled/SyncData.java

@@ -236,18 +236,26 @@ public class SyncData {
 
         return meterReadRecord ;
     }
+    private LocalDateTime changeDateType(Date date){
+        LocalDateTime localDateTime=null;
+        if(date!=null){
+            localDateTime= date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+        }
+        return localDateTime;
+    }
     private void setMeterRead(String registNo,MeterReadRecord meterReadRecord){
         MeterRecord meterRecord = meterRecordMapper.get(registNo);
         if(meterRecord!=null){
             String reading=meterRecord.getMeterReading()+"";
             meterReadRecord.setLastValid(reading);
-            meterReadRecord.setReadTime(meterRecord.getReadingTime().
-                    toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+
+            meterReadRecord.setReadTime(changeDateType(meterRecord.getReadingTime()));
             meterReadRecord.setReadData(reading);
-            Double todayCost = new BigDecimal(calculateTodayCost(reading,
-                    new Double(meterReadRecord.getLastValid()),
-                    meterReadRecord)).setScale(3,BigDecimal.ROUND_HALF_UP).doubleValue();
-           meterReadRecord.setLastCost(BigDecimal.valueOf(todayCost));
+            BigDecimal todayCost =  BigDecimal.valueOf(calculateTodayCost(reading,
+                    new Double(meterReadRecord.getLastValid()),meterReadRecord));
+
+            todayCost = todayCost.setScale(3,BigDecimal.ROUND_HALF_UP);
+            meterReadRecord.setLastCost(todayCost);
             meterReadRecord.setValveState(meterRecord.getValveStatus());
             meterReadRecord.setMeterStatusInfo(meterRecord.getMeterStatusInfo());
             meterReadRecord.setReadStatus(meterRecord.getMeterStatus()+"");