From 0bc5ec040ed28b0999c405c9475988d89a2a98f0 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Tue, 17 Apr 2018 10:12:02 +0800 Subject: [PATCH] update --- .../payment/manage/system/core/ClientContractService.java | 2 +- .../manage/system/core/impl/ClientContractServiceImpl.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/ClientContractService.java b/src/main/java/au/com/royalpay/payment/manage/system/core/ClientContractService.java index 2511eb40c..3dd0d93f4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/system/core/ClientContractService.java +++ b/src/main/java/au/com/royalpay/payment/manage/system/core/ClientContractService.java @@ -7,7 +7,7 @@ import java.util.Date; public interface ClientContractService { - JSONObject getOrGenerateSourceAgreement(int client_id, String channel); + void getOrGenerateSourceAgreement(int client_id, String channel); void confirmSourceAgreement(int client_id, String account_id, String channel); diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java index 2564de76a..4c6892ebd 100644 --- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java @@ -41,7 +41,7 @@ public class ClientContractServiceImpl implements ClientContractService { @Override @Transactional - public JSONObject getOrGenerateSourceAgreement(int client_id, String channel) { + public void getOrGenerateSourceAgreement(int client_id, String channel) { JSONObject client = clientManager.getClientInfo(client_id); if (client == null) { throw new NotFoundException("merchant not found"); @@ -49,11 +49,9 @@ public class ClientContractServiceImpl implements ClientContractService { try { clientManager.getNewAggregateAgreeFile(client.getString("client_moniker"), null, true); } catch (Exception e) { -// logger.info("App generate PDF failed"); + logger.info("App generate PDF failed"); // throw new ServerErrorException("System error"); } - List files = clientFilesMapper.findFileByClientAndType(client_id, "source_agree_file"); - return files.get(0); }