交易明细修改

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

@@ -142,7 +142,7 @@ public class PayFeeServiceImp implements PayFeeService {
                     //生成并保存实收
                     PayPayReceived payPayReceived = getReceived(payReceivable, year, month, localDateTime,5,payseriesno,payReceivable.getDebt(),feetypeMap, siteId, customerId, userId );
                     //生成交易明细
-                    PayTransactiondetails payTransactiondetails = getPayTransactiondetails(5,paywayName, localDateTime, payCustomRechargeDto, payseriesno, month, year, payReceivable.getDebt().negate(), siteId, customerId, userId );
+                    PayTransactiondetails payTransactiondetails = getPayTransactiondetails(5,"预存账户", localDateTime, payCustomRechargeDto, payseriesno, month, year, payReceivable.getDebt().negate(), siteId, customerId, userId );
                     payTransactiondetails.setReceivedId(payPayReceived.getId());
                     payTransactiondetails.setName(payCustomRechargeDto.getAccountname() + payCustomRechargeDto.getAccountnumber() + "扣费");
                     payTransactiondetails.setTranstype(2);
@@ -160,7 +160,7 @@ public class PayFeeServiceImp implements PayFeeService {
 
                     PayPayReceived payPayReceived = getReceived(payReceivable, year, month, localDateTime,5,payseriesno,remaining,feetypeMap, siteId, customerId, userId );
 
-                    PayTransactiondetails payTransactiondetails = getPayTransactiondetails(5, paywayName,localDateTime, payCustomRechargeDto, payseriesno, month, year, remaining.negate() , siteId, customerId, userId );
+                    PayTransactiondetails payTransactiondetails = getPayTransactiondetails(5, "预存账户",localDateTime, payCustomRechargeDto, payseriesno, month, year, remaining.negate() , siteId, customerId, userId );
                     payTransactiondetails.setReceivedId(payPayReceived.getId());
                     payTransactiondetails.setName(payCustomRechargeDto.getAccountname() + payCustomRechargeDto.getAccountnumber() + "扣费");
                     payTransactiondetails.setTranstype(2);
@@ -386,7 +386,7 @@ public class PayFeeServiceImp implements PayFeeService {
                     //生成并保存实收
                     PayPayReceived payPayReceived = getReceived(payReceivable, year, month, localDateTime,5,payseriesno,payReceivable.getDebt(),feetypeMap, siteId, customerId, userId );
                     //生成交易明细
-                    PayTransactiondetails payTransactiondetails = getPayTransactiondetails(5,paywayName, localDateTime, payCustomRechargeDto, payseriesno, month, year, payReceivable.getDebt().negate(), siteId, customerId, userId );
+                    PayTransactiondetails payTransactiondetails = getPayTransactiondetails(5,"预存账户", localDateTime, payCustomRechargeDto, payseriesno, month, year, payReceivable.getDebt().negate(), siteId, customerId, userId );
                     payTransactiondetails.setReceivedId(payPayReceived.getId());
                     payTransactiondetails.setName(payCustomRechargeDto.getAccountname() + payCustomRechargeDto.getAccountnumber() + "扣费");
                     payTransactiondetails.setTranstype(2);
@@ -402,7 +402,7 @@ public class PayFeeServiceImp implements PayFeeService {
                     //生成并保存实收
                     PayPayReceived payPayReceived = getReceived(payReceivable, year, month, localDateTime,5,payseriesno,remaining,feetypeMap, siteId, customerId, userId );
 
-                    PayTransactiondetails payTransactiondetails = getPayTransactiondetails(5, paywayName,localDateTime, payCustomRechargeDto, payseriesno, month, year, remaining.negate() , siteId, customerId, userId );
+                    PayTransactiondetails payTransactiondetails = getPayTransactiondetails(5, "预存账户",localDateTime, payCustomRechargeDto, payseriesno, month, year, remaining.negate() , siteId, customerId, userId );
                     payTransactiondetails.setReceivedId(payPayReceived.getId());
                     payTransactiondetails.setName(payCustomRechargeDto.getAccountname() + payCustomRechargeDto.getAccountnumber() + "扣费");
                     payTransactiondetails.setTranstype(2);

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

@@ -391,7 +391,7 @@
             ,max(cancelperson) cancelperson
             ,max(invoice_id) as "invoiceId"
             from pay_pay_received
-            where canceledrecord_id is null
+            where canceledrecord_id is null and payway !=5
                 and site_id=#{siteId} and customer_id = #{customerId}
                 <if test="beginTime != null">
                     and create_date >= #{beginTime}
@@ -495,8 +495,8 @@
                                 ,min(canceltime) canceltime
                                 ,min(cancelperson) cancelperson
                             from pay_pay_received
-                            where canceledrecord_id is null
-                         and site_id=#{siteId} and customer_id = #{customerId}
+                            where canceledrecord_id is null and payway !=5
+                                and site_id=#{siteId} and customer_id = #{customerId}
                             group by office_id,payseriesno
                     ) r on r.payseriesno = a.payseriesno
         left join sc_user u on ifnull(r.cancelperson,t.cancelperson) = u.id