Merge branch 'update' into develop

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);
 

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<JSONObject> files = clientFilesMapper.findFileByClientAndType(client_id, "source_agree_file");
-        return files.get(0);
 
     }