已存在收据的不能再次保存

交易明细返回收据信息

smart-city-platform/src/main/java/com/bz/smart_city/commom/model/ResultStatus.java

@@ -84,7 +84,8 @@ public enum ResultStatus {
     PAY_ADD_CUSTOMER_UPDATEAMOUNT(-722,"添加开户失败,计算阶梯可用量有误"),
     WATER_PROPERTY_CHENCK_NAME(-723,"该名称已经存在，请修改"),
     ACCOUNT_OPERATOR_EERROR(-724,"操作员信息异常"),
-    PAYFEE_NOT_ENOUGH(-724,"缴费金额不足"),
+    PAYFEE_NOT_ENOUGH(-725,"缴费金额不足"),
+    PAY_INVOICE_EXISTED(-726,"收据信息已存在"),
     CUSTOMER_IS_EXISTED(-3001,"客户名称已存在");
 
     private final int status;

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

@@ -20,6 +20,8 @@ import java.util.List;
 @Data
 @ApiModel("实收Dto")
 public class PayPayReceivedListDto extends BaseDto {
+    @ApiModelProperty(example = "1",notes = "收据id")
+    private BigInteger invoiceId;
     @ApiModelProperty(example = "1",notes = "实收id")
     private BigInteger id;
     @ApiModelProperty(example = "2020年03月费用",notes = "收费项目")

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

@@ -59,7 +59,7 @@ public class PayTransactiondetails extends BaseDto{
     private Integer transtype;
     @ApiModelProperty("交易类型标签值")
     private String transtypeLabel;
-    @ApiModelProperty(value = "票据id", hidden = true)
+    @ApiModelProperty(value = "票据id")
     private BigInteger invoiceId;
     @ApiModelProperty("是否取消(作废)：0正常1作废")
     private Integer iscanceled;

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

@@ -22,6 +22,9 @@ import java.util.List;
 @ApiModel("对账管理——交易明细")
 public class PayTransactiondetailsDto{
 
+    @ApiModelProperty("名称(交易信息)")
+    private String invoiceId;
+
     @ApiModelProperty("名称(交易信息)")
     private String name;
 

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

@@ -116,6 +116,9 @@ public class PayInvoiceServiceImpl implements PayinvoiceService {
         List<PayTransactiondetails> payTransactiondetailsList=payInvoiceMapper.findTransByPayseriesno(payseriesno,loginUser.getSiteId(),loginUser.getCustomerId());
 
         for(PayTransactiondetails payTransactiondetails:payTransactiondetailsList){
+            if(payTransactiondetails.getInvoiceId()!=null){
+                throw new ServiceException(ResultStatus.PAY_INVOICE_EXISTED);
+            }
             //转预存或充值金额
             if(payTransactiondetails.getPayway()!=5&&(payTransactiondetails.getTranstype()==1||payTransactiondetails.getTranstype()==4)){
                 countReceivedamount = countReceivedamount.add(payTransactiondetails.getTransamount()!=null?payTransactiondetails.getTransamount():BigDecimal.ZERO);
@@ -132,6 +135,9 @@ public class PayInvoiceServiceImpl implements PayinvoiceService {
         List<PayPayReceived> Receiveds=payInvoiceMapper.findReceivedByPayseriesno(payseriesno,loginUser.getSiteId(),loginUser.getCustomerId());
 
         for(PayPayReceived received:Receiveds){
+            if(received.getInvoiceId()!=null){
+                throw new ServiceException(ResultStatus.PAY_INVOICE_EXISTED);
+            }
             //非预存划扣（即支付金额抵扣）
             if(received.getPayway()!=5){
                 countReceivedamount = countReceivedamount.add(received.getReceivedamount()!=null?received.getReceivedamount():BigDecimal.ZERO);

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

@@ -127,6 +127,7 @@
             month,
             office_id as "officeId",
             account_id as "accountId",
+            invoice_id as "invoiceId",
             accountname,
             accountnumber
         from pay_pay_transactiondetails
@@ -141,6 +142,7 @@
             account_id as "accountId",
             accountname,
             office_id as "officeId",
+            invoice_id as "invoiceId",
             year,
             month,
             accountnumber,
@@ -252,7 +254,7 @@
             left join pay_pay_receivable re on a.id=re.usedamount_id
             left join pay_pay_received reced on reced.receivable_id=re.id
             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,re.ladderlevel,re.payamount,re.waterbasicprice
+            group by a.account_id,re.feetype, re.feetypename,re.ladderlevel,re.payamount,re.waterbasicprice
             union all
             select
             a.account_id,
@@ -268,7 +270,7 @@
             left join pay_pay_receivable re on a.id=re.usedamount_id
             left join pay_pay_received reced on reced.receivable_id=re.id
             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
+            group by  a.account_id,re.feetype,re.feetypename
         )s
         order by s.accountId,s.feetype,s.ladderlevel
     </select>

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

@@ -86,6 +86,7 @@
         (select label from pay_sys_dict where type = '交易状态' and value = max(rece.state) and site_id = #{siteId} and customer_id =#{customerId}) as "statename",
             max(users.name) as "createbyname",
             max(rece.create_date) as "transtime",
+            max(rece.invoice_id) as "invoiceId",
             rece.year as "year",
             rece.month as "month"
         from pay_pay_received rece

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

@@ -308,6 +308,7 @@
             ,t.transtime
             ,t.transamount
             ,t.payway
+            ,t.invoiceId
             ,dict.label as"paywayLabel"
             ,t.transtype
             ,t.transtypeLabel
@@ -337,10 +338,20 @@
                 ,sum(transamount) transamount
                 ,min(payway) payway
                 ,max(transtype) transtype
+                ,max(invoiceId) as "invoiceId"
                 ,case when max(transtype) = 1 then '充值'
                         else (case when  min(payway) = 5 then '扣费' else '缴费' end ) end transtypeLabel
             from (
-            select accountnumber,accountname,payseriesno,min(transtime) transtime,sum(transamount ) transamount ,max(payway) payway	,1 "transtype",max(iscanceled) iscanceled,max(canceltime) canceltime,max(cancelperson) cancelperson
+            select accountnumber
+            ,accountname
+            ,payseriesno
+            ,min(transtime) transtime
+            ,sum(transamount ) transamount
+            ,max(payway) payway	,1 "transtype"
+            ,max(iscanceled) iscanceled
+            ,max(canceltime) canceltime
+            ,max(cancelperson) cancelperson
+            ,max(invoice_id) as "invoiceId"
             from pay_pay_transactiondetails
             where canceledrecord_id is null and payway !=5 and transtype!=2
                 and site_id=#{siteId} and customer_id = #{customerId}
@@ -371,7 +382,14 @@
                 </if>
             group by accountnumber,accountname,payseriesno
             union all
-            select accountnumber,accountname,payseriesno,min(create_date) transtime,sum(receivedamount) transamount ,min(payway) payway, 0 "transtype",max(iscanceled) iscanceled,max(canceltime) canceltime ,max(cancelperson) cancelperson
+            select accountnumber,accountname,payseriesno
+            ,min(create_date) transtime
+            ,sum(receivedamount) transamount
+            ,min(payway) payway, 0 "transtype"
+            ,max(iscanceled) iscanceled
+            ,max(canceltime) canceltime
+            ,max(cancelperson) cancelperson
+            ,max(invoice_id) as "invoiceId"
             from pay_pay_received
             where canceledrecord_id is null
                 and site_id=#{siteId} and customer_id = #{customerId}
@@ -439,7 +457,7 @@
         ,a.order_no as "orderNo"
         ,ab.type as "payway"
         ,dict.label as"paywayLabel"
-
+        ,ifnull(r.invoiceId,t.invoiceId) invoiceId
         ,ifnull(r.iscanceled,t.iscanceled) iscanceled
         ,ifnull(r.canceltime,t.canceltime) canceltime
         ,ifnull(r.cancelperson,t.cancelperson) cancelperson
@@ -457,6 +475,7 @@
                                 ,1 as transtype
                                 ,'充值' transtypeLabel
                                 ,min(payway) payway
+                                ,max(invoice_id) as "invoiceId"
                                 ,max(iscanceled) iscanceled
                                 ,min(canceltime) canceltime
                                 ,min(cancelperson) cancelperson
@@ -471,6 +490,7 @@
                                 ,0 as  transtype
                                 ,'缴费'  transtypeLabel
                                 ,min(payway) payway
+                                ,max(invoice_id) as "invoiceId"
                                 ,max(iscanceled) iscanceled
                                 ,min(canceltime) canceltime
                                 ,min(cancelperson) cancelperson