Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

@@ -549,16 +549,13 @@ 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"));
-                    if(clearingLog.getBooleanValue("editable")){
+                    JSONObject clearingLog = clearingLogMapper.findById(logs.get(0).getIntValue("clearing_id"));
+                    if(clearingLog.getBoolean("editable")){
                         result.put("padding", true);
                         logs.get(0).put("padding",true);
                     }
             }
         }
-        }
         return result;
     }
 

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

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