mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-21 19:45:09 +08:00
update
This commit is contained in:
@@ -140,7 +140,9 @@ public class PaymentTestController {
|
||||
map.merge(divMember.getMemberId(), new BigDecimal(divMember.getAmount()), BigDecimal::add);
|
||||
}
|
||||
|
||||
if (StringUtils.equals(adapayMemberId, "0")) {
|
||||
if (StringUtils.equals(adapayMemberId, "0")
|
||||
|| StringUtils.equals(adapayMemberId, "AM29102732")) {
|
||||
// 0为默认平台id, AM29102732为罗总账户
|
||||
selfList.add(paymentId);
|
||||
}
|
||||
}
|
||||
@@ -257,12 +259,12 @@ public class PaymentTestController {
|
||||
if (str.trim().length() > 2) {
|
||||
// str根据逗号切割 002212023102515344310563156645282902016,C88208113664,20.0,2.15,17.85,2023-10-25 15:34:49
|
||||
String[] strArr = str.split(",");
|
||||
String paymentId = strArr[0];
|
||||
String orderCode = strArr[1];
|
||||
String payAmount = strArr[2];
|
||||
String refundAmount = strArr[3];
|
||||
String settleAmount = strArr[4];
|
||||
String orderTime = strArr[5];
|
||||
String paymentId = strArr[0]; // 支付id
|
||||
String orderCode = strArr[1]; // 订单编号
|
||||
String payAmount = strArr[2]; // 支付金额
|
||||
String refundAmount = strArr[3]; // 退款金额
|
||||
String settleAmount = strArr[4]; // 结算金额
|
||||
String orderTime = strArr[5]; // 订单时间
|
||||
|
||||
// 如果orderCode长度大于12并且有下划线, 则根据下划线切割只取第一部分
|
||||
if (orderCode.length() > 12 && orderCode.contains("_")) {
|
||||
@@ -307,7 +309,9 @@ public class PaymentTestController {
|
||||
}
|
||||
|
||||
/**
|
||||
* 从文件获取分账参数
|
||||
* 从文件获取批量分账参数
|
||||
* adapayMemberId 待分账的汇付会员id
|
||||
* paymentList 待分账的订单信息(包含订单编号, 结算金额, 支付id)
|
||||
*/
|
||||
public Map<String, Object> getPaymentConfirmParamFromFile() {
|
||||
Map<String, Object> paramMap = Maps.newHashMap();
|
||||
@@ -333,6 +337,8 @@ public class PaymentTestController {
|
||||
|
||||
/**
|
||||
* 批量执行分账
|
||||
* 分账信息在paymentIdAndAmount文件中
|
||||
* paymentId, 订单编号, 待分账金额, 待分账时间
|
||||
*/
|
||||
@Test
|
||||
public void batchCreatePaymentConfirm() {
|
||||
@@ -461,7 +467,7 @@ public class PaymentTestController {
|
||||
|
||||
/**
|
||||
* 批量支付确认撤销
|
||||
*
|
||||
* 用于撤销分账
|
||||
* @throws BaseAdaPayException
|
||||
*/
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user