收据bug修改

缴费修改返回信息

smart-city-platform/src/main/java/com/bz/smart_city/dao/pay/PayInvoiceMapper.java

@@ -29,7 +29,7 @@ public interface PayInvoiceMapper {
     List<PayPayReceived> findReceivedByPayseriesno(@Param("payseriesno") String payseriesno , @Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
     void updatePrintInvoiceRecord(@Param("type") Integer type, @Param("payseriesno") String payseriesno, @Param("invoiceId") BigInteger invoiceId,@Param("siteId") Integer siteId, @Param("customerId") Integer customerId);
     PrintInvoiceData getPrintDataOfTran(@Param("payseriesno")String payseriesno,@Param("siteId")Integer siteId,@Param("customerId")Integer customerId);
-    PrintInvoiceData getLastWaterUsedRecord(@Param("accountid")BigInteger accountId,@Param("date") LocalDateTime date, @Param("siteId")Integer siteId, @Param("customerId")Integer customerId);
+    PrintInvoiceData getLastWaterUsedRecord(@Param("accountId")BigInteger accountId,@Param("date") LocalDateTime date, @Param("siteId")Integer siteId, @Param("customerId")Integer customerId);
 
 
     PrintInvoiceData getDateRangeInfoPrint(@Param("payseriesno")String payseriesno,@Param("siteId")Integer siteId,@Param("customerId")Integer customerId);

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

@@ -52,7 +52,8 @@ public class PayFeeServiceImp implements PayFeeService {
     BaseClosingAccountInfoMapper baseClosingAccountInfoMapper;
 
     public PayfeeResult payFeeCounter( String id,Integer payway,BigDecimal transAmount, Integer balancetype){
-        String result="";   //执行结果描述
+//        String result="";   //执行结果描述
+        String result="<br>实收金额："+String.format("%.2f",transAmount)+"元";
         BigDecimal fees=BigDecimal.ZERO;    //抵扣金额
         LoginUser loginUser = UserUtil.getCurrentUser();
 
@@ -176,7 +177,7 @@ public class PayFeeServiceImp implements PayFeeService {
                 }
             }
         }
-        result+="<br>预存款抵扣："+String.format("%.2f",fees)+"元";
+    //    result+="<br>预存款抵扣："+String.format("%.2f",fees)+"元";
         fees=BigDecimal.ZERO;//
         //缴费抵扣
         Iterator<PayReceivable> iteratorTransAmount = payReceivableList.iterator();
@@ -217,10 +218,10 @@ public class PayFeeServiceImp implements PayFeeService {
                 }
             }
         }
-        result+="<br>支付金额抵扣："+String.format("%.2f",fees)+"元";
+        result+="&emsp;&emsp;支付金额抵扣："+String.format("%.2f",fees)+"元";
         //余额充值或划扣有余额
         if(balancetype == 1 && transAmount.compareTo(BigDecimal.ZERO) == 1){
-            result+="<br>余额转预存："+String.format("%.2f",transAmount)+"元";
+            result+="&emsp;&emsp;余额转预存："+String.format("%.2f",transAmount)+"元";
             //修改余额
             remaining=remaining.add(transAmount);
             //生成交易明细
@@ -230,7 +231,7 @@ public class PayFeeServiceImp implements PayFeeService {
             payTransactiondetails.setTranstypeLabel("账户转预存");
             transactiondetailsDtoList.add(payTransactiondetails);
         }else{
-            result+="<br>余额找零："+String.format("%.2f", transAmount)+"元";
+            result+="&emsp;&emsp;余额找零："+String.format("%.2f", transAmount)+"元";
         }
 
         //修改预存账户