From 4b79f3fe6061780cec919ba6f31f350c6054c35a Mon Sep 17 00:00:00 2001 From: eason Date: Wed, 27 Jun 2018 17:08:18 +0800 Subject: [PATCH 1/2] 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 2/2] 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")); } } }