diff --git a/jsowell-admin/src/test/java/PaymentTestController.java b/jsowell-admin/src/test/java/PaymentTestController.java index 121aa1b44..461df216d 100644 --- a/jsowell-admin/src/test/java/PaymentTestController.java +++ b/jsowell-admin/src/test/java/PaymentTestController.java @@ -147,7 +147,10 @@ public class PaymentTestController { List unSplitList = Lists.newArrayList(); // 未分帐 List splitList = Lists.newArrayList(); // 已分帐 - BigDecimal total = BigDecimal.ZERO; + BigDecimal total = BigDecimal.ZERO; // 总分账金额 + BigDecimal totalWithdrawalAmt = BigDecimal.ZERO; // 实际到账金额汇总 + BigDecimal totalFeeAmt = BigDecimal.ZERO; // 手续费金额汇总 + List selfList = Lists.newArrayList(); Map map = Maps.newHashMap(); @@ -178,6 +181,19 @@ public class PaymentTestController { 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 divMembers = confirm.getDivMembers(); System.out.println("confirm:" + JSON.toJSONString(divMembers)); @@ -185,8 +201,7 @@ public class PaymentTestController { // 放map map.merge(divMember.getMemberId(), new BigDecimal(divMember.getAmount()), BigDecimal::add); } - BigDecimal confirmedAmt = new BigDecimal(confirm.getConfirmedAmt()); - total = total.add(confirmedAmt); + if (StringUtils.equals(adapayMemberId, "0")) { selfList.add(paymentId); } @@ -198,7 +213,8 @@ public class PaymentTestController { } System.out.println("=================未分账:" + JSON.toJSONString(unSplitList) + ", 数量:" + unSplitList.size()); System.out.println("=================已分账:" + JSON.toJSONString(map) + ", 总分账:" + total + ", 数量:" + splitList.size()); - System.out.println("=================自己:" + JSON.toJSONString(selfList) + ", 数量:" + selfList.size()); + System.out.println("===============金额明细:" + "总到账金额:" + totalWithdrawalAmt + ", 总手续费:" + totalFeeAmt); + System.out.println("===================自己:" + JSON.toJSONString(selfList) + ", 数量:" + selfList.size()); } /** diff --git a/jsowell-admin/src/test/resources/payment_ids b/jsowell-admin/src/test/resources/payment_ids index a6b067395..16ec1d026 100644 --- a/jsowell-admin/src/test/resources/payment_ids +++ b/jsowell-admin/src/test/resources/payment_ids @@ -841,8 +841,42 @@ 002212025040117162910753073497191690240 002212025040117455110753080889329733632 002212025040118211110753089782029668352 +002212025040119491110753111927193165824 002212025040119581410753114202818686976 002212025040120220010753120185756561408 002212025040120455610753126209105285120 002212025040120520710753127763042316288 +002212025040121210710753135061086593024 002212025040121323710753137956335812608 +002212025040121443310753140961546194944 +002212025040121513410753142723815759872 +002212025040122122610753147975249637376 +002212025040122195410753149855439728640 +002212025040123204410753165164341608448 +002212025040123290110753167250324701184 +002212025040123503510753172678492999680 +002212025040203410410753230680439246848 +002212025040210024010753326714523865088 +002212025040210211610753331392050311168 +002212025040213120110753374363347410944 +002212025040215521610753414694158618624 +002212025040216144910753420368672702464 +002212025040216322910753424814135476224 +002212025040217472110753443654282149888 +002212025040217473810753443725551718400 +002212025040218085210753449067844325376 +002212025040218140110753450365304360960 +002212025040218222610753452482647015424 +002212025040218242310753452974966755328 +002212025040218360710753455925083406336 +002212025040218393110753456783741321216 +002212025040218395810753456895430610944 +002212025040218551410753460738306461696 +002212025040219374410753471433493430272 +002212025040220410810753487387299241984 +002212025040220455610753488595973087232 +002212025040220475610753489099524390912 +002212025040221081610753494215944949760 +002212025040221255610753498661628882944 +002212025040221265310753498900435775488 +002212025040222290210753514544279244800