From 48d2d7b58efee1e75cd512f9ab66cdc89962debb Mon Sep 17 00:00:00 2001 From: eason Date: Wed, 27 Jun 2018 15:59:46 +0800 Subject: [PATCH 1/5] fix app settlement log --- .../payment/manage/appclient/core/impls/RetailAppServiceImp.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 447419470..b2fc46451 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -554,6 +554,7 @@ public class RetailAppServiceImp implements RetailAppService { JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id")); if(clearingLog.getBooleanValue("editable")){ result.put("padding", true); + logs.get(0).put("padding",true); } } } From 9ddfe7ef1f93a332481d9d585469ceeead15154b Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Wed, 27 Jun 2018 16:01:08 +0800 Subject: [PATCH 2/5] add hf --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4c7992c26..a5ac9569e 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -68,7 +68,7 @@ app.cms.host=https://www.royalpay.com.au/ app.server.ip=127.0.0.1 app.redpack_auth.enable=false - +hf.rsa-file=/opt/2000604000101.pfx ##积分商城 app.customer.host=https://customer.royalpay.com.au/ customer.app.appid=customer From 4b79f3fe6061780cec919ba6f31f350c6054c35a Mon Sep 17 00:00:00 2001 From: eason Date: Wed, 27 Jun 2018 17:08:18 +0800 Subject: [PATCH 3/5] fix --- .../manage/appclient/core/impls/RetailAppServiceImp.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index b2fc46451..a2aacba36 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -552,7 +552,8 @@ public class RetailAppServiceImp implements RetailAppService { JSONObject clearingDetail = clearingDetailMapper.findByDetailId(logs.get(0).getIntValue("clearing_order")); if (clearingDetail!=null){ JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id")); - if(clearingLog.getBooleanValue("editable")){ + if(clearingLog.getBoolean("editable")){ + logger.info("###editable:"+clearingLog.getBoolean("editable")); result.put("padding", true); logs.get(0).put("padding",true); } From 9c5e11b7ebeba4271d1667ee4f8c1775c57a2b2d Mon Sep 17 00:00:00 2001 From: eason Date: Wed, 27 Jun 2018 17:28:11 +0800 Subject: [PATCH 4/5] fix --- .../manage/appclient/core/impls/RetailAppServiceImp.java | 6 +----- .../manage/merchants/core/impls/ClientManagerImpl.java | 2 ++ .../manage/tradelog/core/impls/TradeLogServiceImpl.java | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index a2aacba36..79313cba0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -549,15 +549,11 @@ public class RetailAppServiceImp implements RetailAppService { JSONObject result = PageListUtils.buildPageListResult(logs); if (appQueryBean.getPage() == 1) { if (!logs.isEmpty() && logs.size() > 0) { - JSONObject clearingDetail = clearingDetailMapper.findByDetailId(logs.get(0).getIntValue("clearing_order")); - if (clearingDetail!=null){ - JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id")); + JSONObject clearingLog = clearingLogMapper.findById(logs.get(0).getIntValue("clearing_id")); if(clearingLog.getBoolean("editable")){ - logger.info("###editable:"+clearingLog.getBoolean("editable")); result.put("padding", true); logs.get(0).put("padding",true); } - } } } return result; diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 59268e5e0..ba11193c2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -2658,6 +2658,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id")); if(clearingLog.getBooleanValue("editable")){ result.put("padding", true); + logs.get(0).put("padding",true); + logger.info("##editable"+clearingLog.getBooleanValue("editable")); } } } diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java index cdd48cdaa..73b5b4929 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java @@ -838,6 +838,8 @@ public class TradeLogServiceImpl implements TradeLogService { JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id")); if(clearingLog.getBooleanValue("editable")){ result.put("padding", true); + logs.get(0).put("padding",true); + logger.info("##editable"+clearingLog.getBooleanValue("editable")); } } } From fc744e9f0c55d0ea25aeba669c846fcc33d4aecc Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Wed, 27 Jun 2018 18:29:39 +0800 Subject: [PATCH 5/5] add hf --- pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c7dd78e36..f66157d48 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ au.com.royalpay.payment payment-parent - 0.2.0 + 0.2.0-dev 4.0.0 @@ -28,6 +28,10 @@ au.com.royalpay.payment alipay-core + + au.com.royalpay.payment + hf-core + au.com.royalpay.payment jd-core