收据返回打印类型

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

@@ -20,6 +20,8 @@ import java.util.List;
 @ApiModel("打印信息")
 public class PrintInvoiceData {
 
+    @ApiModelProperty(value = "收据类型：1充值 2缴费")
+    private Integer printType ;
     @ApiModelProperty(value = "票据号码")
     private String invoiceNo ;
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")

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

@@ -1,6 +1,8 @@
 package com.bz.smart_city.service.impl.pay;
 
+import com.bz.smart_city.commom.exception.ServiceException;
 import com.bz.smart_city.commom.model.Pagination;
+import com.bz.smart_city.commom.model.ResultStatus;
 import com.bz.smart_city.commom.util.UserUtil;
 import com.bz.smart_city.dao.pay.PayInvoiceMapper;
 import com.bz.smart_city.dto.LoginUser;
@@ -176,7 +178,10 @@ public class PayInvoiceServiceImpl implements PayinvoiceService {
             }else{
                 printInvoiceData.setPaydate(df.format(LocalDateTime.now()));
             }
+        }else{
+            throw new ServiceException(ResultStatus.OPERATE_RECORD_NOT_EXIT);
         }
+        printInvoiceData.setPrintType(1);
         printInvoiceData.setInvoiceNo(
                 DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS").format(LocalDateTime.now())+""+(int)(Math.random()*1000));
         return printInvoiceData;
@@ -240,6 +245,7 @@ public class PayInvoiceServiceImpl implements PayinvoiceService {
         printInvoiceData.setPrintReceivedInfo(payfeeInfoPrint);
         printInvoiceData.setInvoiceNo(
             DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS").format(LocalDateTime.now())+""+(int)(Math.random()*1000));
+        printInvoiceData.setPrintType(2);
         return printInvoiceData;
     }
 

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

@@ -183,6 +183,7 @@
         and rece.account_id=#{accountId}
         and `year`=#{year}
         group by account_id,accountnumber,accountname,`year`,`month`
+        order by max(rece.create_date) desc
     </select>
     <select id="getPayreceivableDebtDetailed" resultType="com.bz.smart_city.dto.pay.payfee.PayfeeReceivableInfo">
         select
@@ -206,6 +207,7 @@
         where rece.debt > 0
         and rece.account_id=#{accountId}
         and `year`=#{year} and `month`=#{month}
+        order by rece.create_date desc
 
     </select>
 
@@ -234,7 +236,7 @@
         from pay_pay_received reced
         where account_id=#{accountId}
         and `year`=#{year} and `month` = #{month} and payseriesno=#{payseriesno}
-
+        order by create_date desc
     </select>
 
     <select id="getPayreceived" resultType="com.bz.smart_city.dto.pay.payfee.PayfeeReceivedInfo">
@@ -260,6 +262,7 @@
          account_id=#{accountId}
         and `year`=#{year}
         group by account_id,accountnumber,accountname,`year`,`month`,payseriesno
+        order by max(create_date) desc
     </select>
     <select id="getWaterusedamount" resultType="com.bz.smart_city.dto.pay.payfee.PayfeeWaterusedamount">
         select
@@ -275,6 +278,7 @@
                 (case when a.state = 2 then '是' else '否' end ) isReceivable
         from pay_amount_waterusedamount a
         where a.`year`=#{year} and a.account_id=#{accountId}
+        order by a.year desc ,a.month desc
     </select>
 
     <select id="getPayinvoiceInfo" resultType="com.bz.smart_city.dto.pay.PayInvoiceDto">