收据修改

smart-city-platform/src/main/java/com/bz/smart_city/dto/pay/payfee/PrintInvoiceData.java

@@ -99,6 +99,6 @@ public class PrintInvoiceData {
     private String livingareaName;
 
     @ApiModelProperty("结算水量")
-    private String payamount;
+    private BigDecimal payamount;
 
 }

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/PayInvoiceServiceImpl.java

@@ -243,12 +243,19 @@ public class PayInvoiceServiceImpl implements PayinvoiceService {
         PrintInvoiceData printInvoiceDataAccountBaseInfo=payInvoiceMapper.getAccountBaseInfo(accountId);
 
         //拼装数据
-        printInvoiceDataAccountBaseInfo.setReading(printInvoiceDataReceivablefee.getReading());
-        printInvoiceDataAccountBaseInfo.setRecorddate(printInvoiceDataReceivablefee.getRecorddate());
-        printInvoiceDataAccountBaseInfo.setLastreading(printInvoiceDataReceivablefee.getLastreading());
-        printInvoiceDataAccountBaseInfo.setLastrecorddate(printInvoiceDataReceivablefee.getLastrecorddate());
-        printInvoiceDataAccountBaseInfo.setPayamount(printInvoiceDataReceivablefee.getPayamount());
-        printInvoiceDataAccountBaseInfo.setReceivablefee(printInvoiceDataReceivablefee.getReceivablefee());
+        if(printInvoiceDataReceivablefee != null){
+            printInvoiceDataAccountBaseInfo.setReading(printInvoiceDataReceivablefee.getReading());
+            printInvoiceDataAccountBaseInfo.setRecorddate(printInvoiceDataReceivablefee.getRecorddate());
+            printInvoiceDataAccountBaseInfo.setLastreading(printInvoiceDataReceivablefee.getLastreading());
+            printInvoiceDataAccountBaseInfo.setLastrecorddate(printInvoiceDataReceivablefee.getLastrecorddate());
+            printInvoiceDataAccountBaseInfo.setPayamount(printInvoiceDataReceivablefee.getPayamount());
+            printInvoiceDataAccountBaseInfo.setReceivablefee(printInvoiceDataReceivablefee.getReceivablefee());
+        }else{
+            printInvoiceDataAccountBaseInfo.setReading(BigDecimal.ZERO);
+            printInvoiceDataAccountBaseInfo.setLastreading(BigDecimal.ZERO);
+            printInvoiceDataAccountBaseInfo.setPayamount(BigDecimal.ZERO);
+            printInvoiceDataAccountBaseInfo.setReceivablefee(BigDecimal.ZERO);
+        }
         if(printInvoiceData.getRemaining().compareTo(BigDecimal.ZERO) == 1 ){
             printInvoiceDataAccountBaseInfo.setRemaining(printInvoiceData.getRemaining());
         }