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

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

@@ -958,10 +958,15 @@ public class RetailAppServiceImp implements RetailAppService {
         Boolean isUpdate = PlatformEnvironment.getEnv().isAppUpdate(clientType);
         String updateContent = PlatformEnvironment.getEnv().getAppUpdateContent(clientType);
         int update_type = 0;// 0:不更新 1：更新 2：强制更新
-        if (newAppVersion.compareToIgnoreCase(version) > 0) {
-            update_type = 1;
-            if (isUpdate) {
-                update_type = 2;
+        String [] versionArr = version.split("\\.");
+        String [] newVersionArr = newAppVersion.split("\\.");
+        for (int i = 0; i < newVersionArr.length; i++) {
+            if(Integer.valueOf(newVersionArr[i])>Integer.valueOf(versionArr[i])){
+                update_type = 1;
+                if (isUpdate) {
+                    update_type = 2;
+                }
+                i=newVersionArr.length+1;
             }
         }
         JSONObject res = new JSONObject();

src/main/ui/static/payment/partner/templates/partner_detail.html

@@ -80,7 +80,7 @@
                 <button type="button" ng-if="partner.open_status!=10 && partner.approve_result!=1"
                         class="btn btn-success" ng-click="passClient()">Pass
                 </button>
-                <button ng-if="(partner.open_status==1||partner.open_status==4||partner.open_status==10) && partner.approve_result>3"
+                <button ng-if="(partner.open_status==1||partner.open_status==10) && partner.approve_result>3 || partner.open_status==4"
                         type="button" class="btn btn-primary" ng-click="refuse()">Refuse
                 </button>
                 <button type="button" class="btn btn-danger" ng-click="deleteClient()">Delete</button>