From 4d41df91bb67ccabe3ea0731c360dd6e59467e09 Mon Sep 17 00:00:00 2001 From: zhangtao <1316069495@qq.com> Date: Wed, 6 Jan 2021 16:36:56 +0800 Subject: [PATCH] dev_T2055 --- .../clearing/core/impl/CleanServiceImpl.java | 10 +++++++--- src/main/resources/application.yml | 8 ++++++-- src/main/resources/aps_productionA.p12 | Bin 0 -> 3361 bytes src/main/resources/dev.p12 | Bin 0 -> 3185 bytes 4 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/aps_productionA.p12 create mode 100644 src/main/resources/dev.p12 diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java index 8c9e43c1f..7e9a9343b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java @@ -1,9 +1,11 @@ package au.com.royalpay.payment.manage.management.clearing.core.impl; import au.com.royalpay.payment.core.PaymentApi; +import au.com.royalpay.payment.core.beans.OrderValidationResult; import au.com.royalpay.payment.core.exceptions.InvalidShortIdException; import au.com.royalpay.payment.core.tasksupport.SettlementSupport; import au.com.royalpay.payment.core.utils.ExtParamsUtils; +import au.com.royalpay.payment.core.validation.domain.ChannelValidationTask; import au.com.royalpay.payment.manage.management.clearing.core.CleanService; import au.com.royalpay.payment.manage.mappers.log.*; import au.com.royalpay.payment.manage.mappers.payment.TaskManualSettleMapper; @@ -147,6 +149,8 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider private Locker locker; @Resource private ClientIncrementalMapper clientIncrementalMapper; + @Resource + private ChannelValidationTask channelValidationTask; @Resource private ClientDeviceMapper clientDeviceMapper; @@ -1528,14 +1532,14 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider return JSON.parseObject(reportItem.getString("result")); } } - JSONObject report = paymentApi.validTransactions(dt, fix); + OrderValidationResult report = channelValidationTask.validTransactions(dt); JSONObject log = new JSONObject(); log.put("valid_date", dt); log.put("create_time", new Date()); - log.put("result", report.toJSONString()); + log.put("result", report.getReport().toJSONString()); validationLogMapper.removeByDate(dt); validationLogMapper.save(log); - return report; + return JSON.parseObject(log.getString("result")); } @Override diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e75c109fc..dc94221d1 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -18,6 +18,9 @@ jetty: multipart: max-file-size: 10Mb app: + sandbox: true + active: + channels: Wechat,Alipay,AlipayOnline,Gmo,UnionPay,AlipayPlus crossapp: enable: true agreetemplate: @@ -89,8 +92,9 @@ android: apple: message: apns: - file: '' - password: '' + file: src/main/resources/dev.p12 + password: HQeYblIajOb0 + saneboxMode: true customer: app: appid: customer diff --git a/src/main/resources/aps_productionA.p12 b/src/main/resources/aps_productionA.p12 new file mode 100644 index 0000000000000000000000000000000000000000..525f4fbcd1d76779b6f0ab69edd593a2834d54aa GIT binary patch literal 3361 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/dev.p12 b/src/main/resources/dev.p12 new file mode 100644 index 0000000000000000000000000000000000000000..5210b6fa4b93c41e7629ac8f2ac7959e58b951a6 GIT binary patch literal 3185 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 O(3