b2894lxlx/yunxinwei-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
gxwebsoft
2023-12-20 14:19:06 +08:00
parent 4ae7261195 12fa7348cb
commit 2a38f01da7
4 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/test/java/com/gxwebsoft/TestMain.java
View File

@@ -301,10 +301,7 @@ public class TestMain {
public void close() throws AlipayApiException {
List<FreezeOrder> freeze = freezeOrderService.lambdaQuery().eq(FreezeOrder::getOperationType, "FREEZE").list();
List<FreezeOrder> unfreeze = freezeOrderService.lambdaQuery().eq(FreezeOrder::getOperationType, "UNFREEZE").list();
Map<String, List<FreezeOrder>> collect = unfreeze.stream().collect(Collectors.groupingBy(FreezeOrder::getOutOrderNo));
DefaultAlipayClient alipayClient = null;
try {
alipayClient = alipayConfig.alipayClient(6);
@@ -312,17 +309,16 @@ public class TestMain {
throw new RuntimeException(e);
}
DefaultAlipayClient finalAlipayClient = alipayClient;
freeze.forEach(item -> {
List<FreezeOrder> freezeOrders = collect.get(item.getOutOrderNo());
if(CollectionUtils.isEmpty(freezeOrders)) {
AlipayFundAuthOrderUnfreezeRequest request = new AlipayFundAuthOrderUnfreezeRequest();
// request.setNotifyUrl("https://yxw.wsdns.cn/api/shop/freeze-order/notify");
request.setNotifyUrl("http://1.14.132.108:10090/api/shop/freeze-order/notify");
request.setNotifyUrl("https://yxw.wsdns.cn/api/shop/freeze-order/notify");
// request.setNotifyUrl("http://1.14.132.108:10090/api/shop/freeze-order/notify");
JSONObject bizContent = new JSONObject();
bizContent.put("auth_no", item.getAuthNo());
bizContent.put("auth_no", "2023102510002001070541674772");
bizContent.put("out_request_no", IdUtil.getSnowflakeNextId());
bizContent.put("amount", item.getAmount());
bizContent.put("amount", "300.00");
// bizContent.put("amount", .99);
bizContent.put("remark", "解冻资金");
@@ -346,8 +342,6 @@ public class TestMain {
} else {
System.out.println("调用失败");
}
}
});
}
}