收据打印修改

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

@@ -119,16 +119,16 @@ public class PayInvoiceServiceImpl implements PayinvoiceService {
             if(payTransactiondetails.getInvoiceId()!=null){
                 throw new ServiceException(ResultStatus.PAY_INVOICE_EXISTED);
             }
+            invoice.setAccountId(payTransactiondetails.getAccountId());
+            invoice.setAccountname(payTransactiondetails.getAccountname());
+            invoice.setAccountnumber(payTransactiondetails.getAccountnumber());
+            invoice.setOfficeId(payTransactiondetails.getOfficeId());
+            invoice.setYear(payTransactiondetails.getYear());
+            invoice.setMonth(payTransactiondetails.getMonth());
             //转预存或充值金额
             if(payTransactiondetails.getPayway()!=5&&(payTransactiondetails.getTranstype()==1||payTransactiondetails.getTranstype()==4)){
                 countReceivedamount = countReceivedamount.add(payTransactiondetails.getTransamount()!=null?payTransactiondetails.getTransamount():BigDecimal.ZERO);
 
-                invoice.setAccountId(payTransactiondetails.getAccountId());
-                invoice.setAccountname(payTransactiondetails.getAccountname());
-                invoice.setAccountnumber(payTransactiondetails.getAccountnumber());
-                invoice.setOfficeId(payTransactiondetails.getOfficeId());
-                invoice.setYear(payTransactiondetails.getYear());
-                invoice.setMonth(payTransactiondetails.getMonth());
             }
         }
         //获取同批次号的实收信息
@@ -138,16 +138,16 @@ public class PayInvoiceServiceImpl implements PayinvoiceService {
             if(received.getInvoiceId()!=null){
                 throw new ServiceException(ResultStatus.PAY_INVOICE_EXISTED);
             }
+            invoice.setAccountId(received.getAccountId());
+            invoice.setAccountname(received.getAccountname());
+            invoice.setAccountnumber(received.getAccountnumber());
+            invoice.setOfficeId(received.getOfficeId());
+            invoice.setYear(received.getYear());
+            invoice.setMonth(received.getMonth());
             //非预存划扣（即支付金额抵扣）
             if(received.getPayway()!=5){
                 countReceivedamount = countReceivedamount.add(received.getReceivedamount()!=null?received.getReceivedamount():BigDecimal.ZERO);
 
-                invoice.setAccountId(received.getAccountId());
-                invoice.setAccountname(received.getAccountname());
-                invoice.setAccountnumber(received.getAccountnumber());
-                invoice.setOfficeId(received.getOfficeId());
-                invoice.setYear(received.getYear());
-                invoice.setMonth(received.getMonth());
             }
 
         }