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 000000000..525f4fbcd Binary files /dev/null and b/src/main/resources/aps_productionA.p12 differ diff --git a/src/main/resources/dev.p12 b/src/main/resources/dev.p12 new file mode 100644 index 000000000..5210b6fa4 Binary files /dev/null and b/src/main/resources/dev.p12 differ