|
|
@@ -36,10 +36,10 @@ public class AdapayServiceTest extends ApplicationTests {
|
|
|
ForkJoinPool customThreadPool = new ForkJoinPool(100);
|
|
|
customThreadPool.submit(() -> {
|
|
|
|
|
|
- List<AdaTrade> list = EasyExcel.read("/Users/drew/Downloads/merTransDetail_0284905900625472_20220121_20220121_1642753409.xlsx")
|
|
|
+ List<AdaTrade> list = EasyExcel.read("/Users/drew/Downloads/merTransDetail_0284905900625472_20220212_20220212_1644980532.xlsx")
|
|
|
.head(AdaTrade.class).sheet().doReadSync();
|
|
|
list = list.parallelStream().filter(adaTrade -> {
|
|
|
- return adaTrade.get交易金额().equals("1.00")
|
|
|
+ return adaTrade.get交易金额().equals("19.80")
|
|
|
&& orderRepo.findByTransactionId(adaTrade.get支付流水号()) == null
|
|
|
&& giftOrderRepo.findByTransactionId(adaTrade.get支付流水号()) == null;
|
|
|
}).collect(Collectors.toList());
|
|
|
@@ -79,7 +79,8 @@ public class AdapayServiceTest extends ApplicationTests {
|
|
|
refundParams.put("payment_id", adaTrade.get支付流水号());
|
|
|
Map<String, Object> refund = Refund.query(refundParams);
|
|
|
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(refund));
|
|
|
- if ("S".equals(jsonObject.getJSONArray("refunds").getJSONObject(0).getString("trans_status"))) {
|
|
|
+ if ("S".equals(jsonObject.getJSONArray("refunds")
|
|
|
+ .getJSONObject(jsonObject.getJSONArray("refunds").size() - 1).getString("trans_status"))) {
|
|
|
success = true;
|
|
|
}
|
|
|
} catch (Exception e) {
|