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 85379d5..04f67d2 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 @@ -257,6 +257,11 @@ // tradeType 11 --> 转账入金 balanceTransactionsVO.setTradeType(11); } + if("-".equals(byxQueryTransListRowVO.getAmtSymbol())){ + // amtSymbol+表示入金,-表示出金 + // tradeType 40 --> 消费(转账) + balanceTransactionsVO.setTradeType(40); + } balanceTransactionsVO.setSettledAmount(Convert.toLong(byxQueryTransListRowVO.getTransAmt()) ); balanceTransactionsVO.setRemark(byxQueryTransListRowVO.getRemark()); balanceTransactionsVO.setSucceededAt(DateTimeUtils.getDateTimeToRFC3339(byxQueryTransListRowVO.getProcTime())); @@ -792,7 +797,7 @@ @Override @Transactional(rollbackFor = Exception.class) public void withdrawalsCallBack(String outOrderNo) { - AllinpayMutual allinpayMutual = allinpayMutualRepository.findFirstByBizOrderNo(outOrderNo); + AllinpayMutual allinpayMutual = allinpayMutualRepository.findFirstByOriBizOrderNo(outOrderNo); if (allinpayMutual == null) { log.error("未查询到提现记录!!!"); return; @@ -823,7 +828,7 @@ // }}; // return chinaumsUtil.execute(RouteUtil.ROUTE_WALLET_WITHDRAWALS_BY_OUT_ORDER_NO, (JSONObject) JSONObject.toJSON(map), WithdrawalsVO.class); WithdrawalsVO withdrawalsVO = new WithdrawalsVO(); - AllinpayMutual allinpayMutual = allinpayMutualRepository.findFirstByBizOrderNo(outOrderNo); + AllinpayMutual allinpayMutual = allinpayMutualRepository.findFirstByOriBizOrderNo(outOrderNo); if(ObjectUtil.isNull(allinpayMutual)){ throw new YnceErrorException("未查询到提现记录!!!"); } @@ -840,7 +845,7 @@ byxQueryTransResultDTO.setWalletId(chinaumsAuthInfo.getBalanceAcctId()); byxQueryTransResultDTO.setMctOrderNo(allinpayMutual.getOriBizOrderNo()); // byxTradeWayService.setTradeWayInCert(byxQueryTransResultDTO,byxQueryTransResultDTO.getWalletId()); - log.info("{}",byxQueryTransResultDTO); + log.error("提现回调查询:{}",byxQueryTransResultDTO); ByxQueryTransResultVO byxQueryTransResultVO = byxChinaumsUtil.execute(ByxRouteUtil.ROUTE_WALLET_WITHDRAWALS_BY_OUT_ORDER_NO, (JSONObject) JSONObject.toJSON(byxQueryTransResultDTO), ByxQueryTransResultVO.class); if(Constant.RETURN_SUCCESS_CODE.equals(byxQueryTransResultVO.getRspCode())){ if(ObjectUtil.isNotEmpty(byxQueryTransResultVO.getRowList())){ @@ -2474,7 +2479,7 @@ .withZone(ZoneId.of("Asia/Shanghai")); // 可查90个自然日的交易,单次查询开始和结束时间间隔不大于7天 LocalDateTime dateTime = LocalDateTime.now().minusDays(6L); - BalanceTransactionsPageVO balanceTransactionsPageVO = this.balanceTransactions(company.getWalletId(), dateTimeFormatter.format(dateTime), null); + BalanceTransactionsPageVO balanceTransactionsPageVO = this.balanceTransactions(company.getWalletId(), dateTimeFormatter.format(dateTime), dateTimeFormatter.format(LocalDateTime.now())); if (balanceTransactionsPageVO ==null || balanceTransactionsPageVO.getTotal() <= 0) { log.warn("未查询到流水记录!!!"); return; @@ -2483,6 +2488,7 @@ boolean flag = false; List data = balanceTransactionsPageVO.getData(); for (BalanceTransactionsPageVO.BalanceTransactionsVO d : data) { + log.error("BalanceTransactionsVO:{}",d); // 只处理交易类型为入金的流水 if (d.getTradeType() != 11 && d.getTradeType() != 93) { continue;