退款参数加入账单

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/pay/ChinaumsSenselessPayService.java

@@ -494,33 +494,35 @@ public class ChinaumsSenselessPayService extends SuperService {
         destinationTransaction.setRemark(remark);
         destinationTransaction.setMeta(Map.of("paymentType",PaymentType.UnionFrictionlessPay, "description", "用户余额支付"));
         transferModel.setDestinations(new TransferTransactionsModel.GeneralLedgerTransaction[]{destinationTransaction});
-        transactionLogService.transfer(transferModel);
+//        transactionLogService.transfer(transferModel);
 
         //支付：机构余额子账- 用户无感支付子账+
         //构建转账参数
         TransferTransactionsModel payTransferModel = new TransferTransactionsModel();
         //构建出账账户
+        TransferTransactionsModel.GeneralLedgerTransaction orgDestinationTransaction = new TransferTransactionsModel.GeneralLedgerTransaction();
+        orgDestinationTransaction.setGeneralLedgerId(orgWaitSettle.getLedgerId());
+        orgDestinationTransaction.setOrderNumber(orderNo);
+        orgDestinationTransaction.setTransactionType(TransactionType.Pay);
+        orgDestinationTransaction.setTransactionStatus(TransactionStatus.Success);
+        orgDestinationTransaction.setAmount(total.negate().longValue());
+        orgDestinationTransaction.setRemark(remark);
+        orgDestinationTransaction.setMeta(Map.of("paymentType",PaymentType.UnionFrictionlessPay, "description", "银联无感支付"));
+        payTransferModel.setSource(new TransferTransactionsModel.GeneralLedgerTransaction[]{orgDestinationTransaction});
+
+        //构建入账账户
         TransferTransactionsModel.GeneralLedgerTransaction userSourceTransaction = new TransferTransactionsModel.GeneralLedgerTransaction();
-        userSourceTransaction.setGeneralLedgerId(orgWaitSettle.getLedgerId());
+        userSourceTransaction.setGeneralLedgerId(userBalancePayment.getLedgerId());
         userSourceTransaction.setOrderNumber(orderNo);
         userSourceTransaction.setTransactionType(TransactionType.Pay);
         userSourceTransaction.setTransactionStatus(TransactionStatus.Success);
-        userSourceTransaction.setAmount(total.negate().longValue());
+        userSourceTransaction.setAmount(total.longValue());
         userSourceTransaction.setRemark(remark);
         userSourceTransaction.setMeta(Map.of("paymentType",PaymentType.UnionFrictionlessPay, "description", "银联无感支付"));
-        payTransferModel.setSource(new TransferTransactionsModel.GeneralLedgerTransaction[]{userSourceTransaction});
-
-        //构建入账账户
-        TransferTransactionsModel.GeneralLedgerTransaction orgDestinationTransaction = new TransferTransactionsModel.GeneralLedgerTransaction();
-        destinationTransaction.setGeneralLedgerId(userBalancePayment.getLedgerId());
-        destinationTransaction.setOrderNumber(orderNo);
-        destinationTransaction.setTransactionType(TransactionType.Pay);
-        destinationTransaction.setTransactionStatus(TransactionStatus.Success);
-        destinationTransaction.setAmount(total.longValue());
-        destinationTransaction.setRemark(remark);
-        destinationTransaction.setMeta(Map.of("paymentType",PaymentType.UnionFrictionlessPay, "description", "银联无感支付"));
         payTransferModel.setDestinations(new TransferTransactionsModel.GeneralLedgerTransaction[]{orgDestinationTransaction});
-        return transactionLogService.transfer(payTransferModel);
+        TransferTransactionsModels transactionsModels = new TransferTransactionsModels();
+        transactionsModels.setItems(new TransferTransactionsModel[]{transferModel, payTransferModel});
+        return transactionLogService.transfers(transactionsModels);
     }