收据保存

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

@@ -117,7 +117,7 @@ public class PayInvoiceServiceImpl implements PayinvoiceService {
 
         for(PayTransactiondetails payTransactiondetails:payTransactiondetailsList){
             //转预存或充值金额
-            if(payTransactiondetails.getPayway()!=4&&(payTransactiondetails.getTranstype()==1||payTransactiondetails.getTranstype()==4)){
+            if(payTransactiondetails.getPayway()!=5&&(payTransactiondetails.getTranstype()==1||payTransactiondetails.getTranstype()==4)){
                 countReceivedamount = countReceivedamount.add(payTransactiondetails.getTransamount()!=null?payTransactiondetails.getTransamount():BigDecimal.ZERO);
 
                 invoice.setAccountId(payTransactiondetails.getAccountId());
@@ -133,7 +133,7 @@ public class PayInvoiceServiceImpl implements PayinvoiceService {
 
         for(PayPayReceived received:Receiveds){
             //非预存划扣（即支付金额抵扣）
-            if(received.getPayway()!=4){
+            if(received.getPayway()!=5){
                 countReceivedamount = countReceivedamount.add(received.getReceivedamount()!=null?received.getReceivedamount():BigDecimal.ZERO);
 
                 invoice.setAccountId(received.getAccountId());

smart-city-platform/src/main/resources/mapper/pay/PayInvoiceMapper.xml

@@ -236,6 +236,7 @@
         from (
             select
             a.account_id as "accountId",
+            re.feetype,
             re.feetypename,
             re.ladderlevel,
             (case when re.ladderlevel = 1 then '一阶'
@@ -255,6 +256,7 @@
             union all
             select
             a.account_id,
+            re.feetype,
             re.feetypename,
             '' as "ladderlevel",
             '' as "ladderlevelname",
@@ -268,7 +270,7 @@
             where  re.feetype !=1  and a.`year`*12+a.`month` >= #{minPeriod} and a.`year`*12+a.`month` <= #{maxPeriod} and  a.account_id=#{accountId}
             group by  a.account_id,re.feetypename
         )s
-        order by s.accountId,s.feetypename,s.ladderlevel
+        order by s.accountId,s.feetype,s.ladderlevel
     </select>
     
     <select id="getPayfeeRemainingPrint"  resultType="com.bz.smart_city.dto.pay.payfee.PrintInvoiceData">