Merge remote-tracking branch 'origin/develop' into develop

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>0.2.0</version>
+        <version>0.2.0-dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,6 +28,10 @@
             <groupId>au.com.royalpay.payment</groupId>
             <artifactId>alipay-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>au.com.royalpay.payment</groupId>
+            <artifactId>hf-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>au.com.royalpay.payment</groupId>
             <artifactId>jd-core</artifactId>

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;

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

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