diff --git a/src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/impl/WalletServiceImpl.java b/src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/impl/WalletServiceImpl.java index 6c25c3d..1bf8b0a 100644 --- a/src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/impl/WalletServiceImpl.java +++ b/src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/impl/WalletServiceImpl.java @@ -259,6 +259,7 @@ balanceTransactionsVO.setBalanceAcctId(byxQueryTransListRowVO.getWalletId()); balanceTransactionsVO.setTradeId(byxQueryTransListRowVO.getTransOrderNo()); balanceTransactionsVO.setOutOrderNo(byxQueryTransListRowVO.getMctOrderNo()); + balanceTransactionsVO.setAmtSymbol(byxQueryTransListRowVO.getAmtSymbol()); if("+".equals(byxQueryTransListRowVO.getAmtSymbol())){ // amtSymbol+表示入金,-表示出金 // tradeType 11 --> 转账入金 @@ -633,10 +634,10 @@ ByxTransferVO byxTransferVO = byxChinaumsUtil.execute(ByxRouteUtil.ROUTE_WALLET_PAYMENTS, (JSONObject) JSONObject.toJSON(byxTransferDTO), ByxTransferVO.class); if(Constant.RETURN_SUCCESS_CODE.equals(byxTransferVO.getRspCode())){ - accountPaymentsVO.setStatus("succeeded"); + accountPaymentsVO.setStatus( TransferState.SUCCESS.getValue()); } else { - accountPaymentsVO.setStatus("failed"); + accountPaymentsVO.setStatus(TransferState.FAIL.getValue()); accountPaymentsVO.setReason(byxTransferVO.getRspResult()); } accountPaymentsVO.setPaymentId(byxTransferVO.getTransOrderNo()); @@ -2474,8 +2475,9 @@ } // stringRedisTemplate.expire(lockKeyTradeId, 1, TimeUnit.MINUTES); try { - ChinaumsAuthInfo chinaumsAuthInfo = chinaumsAuthInfoRepository.findFirstByBalanceAcctId(externalIncomeDTO.getPayBalanceAcctId()); - if (chinaumsAuthInfo == null) { + ChinaumsAuthInfo outputAuthInfo = chinaumsAuthInfoRepository.findFirstByBalanceAcctId(externalIncomeDTO.getPayBalanceAcctId()); + ChinaumsAuthInfo inputAuthInfo = chinaumsAuthInfoRepository.findFirstByBalanceAcctId(externalIncomeDTO.getBalanceAcctId()); + if (outputAuthInfo == null) { throw new YnceErrorException("未查询到银联认证信息"); } AccountChangeList accountChangeList = accountChangeListRepository.findFirstBySourceNo(externalIncomeDTO.getTradeId()); @@ -2483,7 +2485,7 @@ log.warn("该入金已生成异动记录!!!"); return; } - Company company = chinaumsAuthInfo.getCompany(); + Company company = outputAuthInfo.getCompany(); // Account account = accountRepository.findDepositAccount(company.getId()); // TopUpList topUpList = topUpListRepository.findTopByAccountAndStateOrderByCreatedOnDesc(account, TopUpState.PAID); DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss+08:00") @@ -2516,7 +2518,7 @@ if (StringUtils.isNotEmpty(d.getRemark())) { rechargeDTO.setRemarks(d.getRemark()); } else { - rechargeDTO.setRemarks("银联钱包转账"); + rechargeDTO.setRemarks("转账-"+inputAuthInfo.getCompany().getName()); } rechargeDTO.setPaymentMethod("银联支付"); // rechargeDTO.setFinishedDate(LocalDateTime.parse(d.getSucceededAt(), DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSzzz"))); @@ -2529,15 +2531,14 @@ // 转入账号生成充值记录 RechargeDTO transferIntoDTO = new RechargeDTO(); - ChinaumsAuthInfo transferIntoAuthInfo = chinaumsAuthInfoRepository.findFirstByBalanceAcctId(externalIncomeDTO.getBalanceAcctId()); - transferIntoDTO.setCompanyId(transferIntoAuthInfo.getCompany().getId()); + transferIntoDTO.setCompanyId(inputAuthInfo.getCompany().getId()); transferIntoDTO.setRechargeAmount(rechargeAmount); - transferIntoDTO.setRemarks("银联钱包转账"); + transferIntoDTO.setRemarks("转账-来自" + outputAuthInfo.getCompany().getName()); transferIntoDTO.setPaymentMethod("银联支付"); transferIntoDTO.setFinishedDate(rechargeDTO.getFinishedDate()); transferIntoDTO.setSourceNo(d.getTradeId()); transferIntoDTO.setChangeDirection(ChangeDirection.ADD); - transferIntoDTO.setAccountChangeType(AccountChangeType.TOPUP); + transferIntoDTO.setAccountChangeType(AccountChangeType.TRANSFER); unionpayAccountService.rechargeMoney(transferIntoDTO); break; }