|
|
@@ -8,6 +8,7 @@ import com.github.microservice.pay.client.model.PayProductParameter;
|
|
|
import com.github.microservice.pay.client.model.chinaSenseless.*;
|
|
|
import com.github.microservice.pay.client.model.ledger.TransactionLogModel;
|
|
|
import com.github.microservice.pay.client.model.ledger.TransferTransactionsModel;
|
|
|
+import com.github.microservice.pay.client.model.ledger.TransferTransactionsModels;
|
|
|
import com.github.microservice.pay.client.product.senseless.chinaumsSenseless.conf.ChinaumsSenselessConf;
|
|
|
import com.github.microservice.pay.client.ret.ResultState;
|
|
|
import com.github.microservice.pay.client.service.PayProductAccountService;
|
|
|
@@ -405,7 +406,7 @@ 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);
|
|
|
|
|
|
//支付:用户余额子账- 机构无感支付子账+
|
|
|
//构建转账参数
|
|
|
@@ -431,7 +432,9 @@ public class ChinaumsSenselessPayService extends SuperService {
|
|
|
orgDestinationTransaction.setRemark(remark);
|
|
|
orgDestinationTransaction.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);
|
|
|
}
|
|
|
|
|
|
public com.github.microservice.pay.client.ret.ResultContent<List<TransactionLogModel>> handleRefund(String projectOid, String oid, String userId, BigDecimal total, String orderNo, String remark) {
|