龙泉收据

smart-city-platform/src/main/java/com/bz/smart_city/controller/pay/PayInvoiceController.java

@@ -116,6 +116,9 @@ public class PayInvoiceController {
         }else if(type != null && type.getPayInvoiceType() == 2){  //盖州
             printInvoiceData = payinvoiceService.getPrintDataOfTransGaizhou(payseriesno);
 
+        }else if(type != null && type.getPayInvoiceType() == 3){  //突泉县龙泉水司
+            printInvoiceData = payinvoiceService.getPrintDataOfTransLongquan(payseriesno);
+
         }
 
         if(printInvoiceData != null){

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

@@ -311,10 +311,17 @@ public class PayInvoiceServiceImpl implements PayinvoiceService {
                     printDataLongquan.setApproveDate(df.format(LocalDateTime.now()));
                 }
             }
+            //没有交易明细记录则取当前余额作为上期余额和本期余额
+            if(printInvoiceData.getTransamount() != null){
+                printDataLongquan.setRemaining(printInvoiceData.getRemaining());
+            }
+            if(printInvoiceData.getTransamount() != null){
+                printDataLongquan.setLastRemaining(printInvoiceData.getLastRemaining());
+            }else{
+                printDataLongquan.setLastRemaining(printDataLongquan.getRemaining());
+            }
 
             printDataLongquan.setTransamount(printInvoiceData.getTransamount());
-            printDataLongquan.setLastRemaining(printInvoiceData.getLastRemaining());
-            printDataLongquan.setRemaining(printInvoiceData.getRemaining());
             printDataLongquan.setCreateBy(printInvoiceData.getCreateBy());
 
             if(printInvoiceData.getCreateDate()!=null){