根据paymentIdList查询分账信息

This commit is contained in:
Guoqs
2025-10-11 14:12:32 +08:00
parent f59201129f
commit da5664b7bf
4 changed files with 176 additions and 142 deletions

View File

@@ -1643,10 +1643,6 @@ public class AdapayService {
unSplitList.add(paymentId);
}
}
// System.out.println("=================未分账:" + JSON.toJSONString(unSplitList) + ", 数量:" + unSplitList.size());
// System.out.println("=================已分账:" + JSON.toJSONString(map) + ", 总分账:" + total + ", 数量:" + splitList.size());
// System.out.println("===============金额明细:" + "总到账金额:" + totalWithdrawalAmt + ", 总手续费:" + totalFeeAmt);
// System.out.println("===================自己:" + JSON.toJSONString(selfList) + ", 数量:" + selfList.size());
log.info("\n入参paymentId数量:{}, 已分帐数量:{}, 未分帐数量:{}, 未分帐id:{} " +
"\n已分帐:{}, 总分账:{}, 数量:{}" +
"\n金额明细:[总到账金额:{}, 总手续费:{}] " +
@@ -1657,4 +1653,100 @@ public class AdapayService {
selfList, selfList.size());
return unSplitList;
}
/**
* 根据paymentIdList查询分账信息
*/
public Map<String, List<String>> getSplitInfoMapByPaymentIdList(List<String> paymentIdList) throws BaseAdaPayException {
Map<String, List<String>> resultMap = Maps.newHashMap();
if (CollectionUtils.isEmpty(paymentIdList)) {
return resultMap;
}
List<String> unSplitList = Lists.newArrayList(); // 未分帐
List<String> splitList = Lists.newArrayList(); // 已分帐
List<String> selfList = Lists.newArrayList(); // 自己分帐
BigDecimal total = BigDecimal.ZERO; // 总分账金额
BigDecimal totalWithdrawalAmt = BigDecimal.ZERO; // 实际到账金额汇总
BigDecimal totalFeeAmt = BigDecimal.ZERO; // 手续费金额汇总
Map<String, BigDecimal> amountDetailMap = Maps.newHashMap();
for (String paymentId : paymentIdList) {
if (StringUtils.isBlank(paymentId)) {
continue;
}
// 根据paymentId查询支付确认情况
QueryPaymentConfirmDTO dto = new QueryPaymentConfirmDTO();
dto.setPaymentId(paymentId);
dto.setWechatAppId(wechatAppId1);
QueryPaymentConfirmDetailResponse response = this.queryPaymentConfirmList(dto);
if (response == null) {
// 未查询到分账信息add to unSplitList
unSplitList.add(paymentId);
continue;
}
List<PaymentConfirmInfo> confirms = response.getPaymentConfirms();
if (CollectionUtils.isEmpty(confirms)) {
// confirms为空add to unSplitList
unSplitList.add(paymentId);
continue;
}
// 添加到已分帐list
splitList.add(paymentId);
for (PaymentConfirmInfo confirm : confirms) {
if (this.queryConfirmReverseStatus(confirm)) {
log.info("支付确认id:" + confirm.getId() + "撤销了。。。");
continue;
}
JSONObject jsonObject = JSON.parseObject(confirm.getDescription());
String adapayMemberId = jsonObject.getString("adapayMemberId");
if (StringUtils.isBlank(adapayMemberId)) {
adapayMemberId = jsonObject.getString("adapayMemberIds");
}
BigDecimal confirmAmt = new BigDecimal(confirm.getConfirmAmt()); // 本次确认金额
BigDecimal confirmedAmt = new BigDecimal(confirm.getConfirmedAmt()); // 已确认金额
BigDecimal feeAmt = new BigDecimal(confirm.getFeeAmt()); // 手续费
// 汇总已确认金额
total = total.add(confirmedAmt);
// 汇总手续费金额
totalFeeAmt = totalFeeAmt.add(feeAmt);
// 汇总可提现金额
totalWithdrawalAmt = totalWithdrawalAmt.add(confirmAmt).subtract(feeAmt);
// confirm
List<DivMember> divMembers = confirm.getDivMembers();
// System.out.println("confirm:" + JSON.toJSONString(divMembers));
for (DivMember divMember : divMembers) {
// 放map
amountDetailMap.merge(divMember.getMemberId(), new BigDecimal(divMember.getAmount()), BigDecimal::add);
}
if (StringUtils.equals(adapayMemberId, "0")
|| StringUtils.equals(adapayMemberId, "AM29102732")) {
// 0为默认平台id, AM29102732为罗总账户
selfList.add(paymentId);
}
}
}
log.info("\n入参paymentId数量:{}, 已分帐数量:{}, 未分帐数量:{}, 未分帐id:{} " +
"\n已分帐:{}, 总分账:{}, 数量:{}" +
"\n金额明细:[总到账金额:{}, 总手续费:{}] " +
"\n自己:{}, 数量:{}",
paymentIdList.size(), splitList.size(), unSplitList.size(), unSplitList,
JSON.toJSONString(amountDetailMap), total, splitList.size(),
totalWithdrawalAmt, totalFeeAmt,
selfList, selfList.size());
resultMap.put("unSplitList", unSplitList);
resultMap.put("splitList", splitList);
return resultMap;
}
}