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
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 69c6c2f42..b94792b02 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
@@ -553,13 +553,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"));
- 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;
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"));
}
}
}
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