fix 跨境商城使用详情页面

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.53</version>
+    <version>1.3.54</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -6495,7 +6495,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             throw new InvalidShortIdException();
         }
         JSONObject clientConfig = clientConfigMapper.find(client.getIntValue("client_id"));
-        JSONObject incrementalInfo = clientIncrementalMapper.findByClinetIdAndChannelIsValid(client.getInteger("client_id"), channel);
+        JSONObject incrementalInfo = clientIncrementalMapper.findByClinetIdAndChannel(client.getInteger("client_id"), channel);
         if (!clientConfig.getBooleanValue("geek_shop_status")) {
             throw new BadRequestException("Merchant service not opened");
         }

src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html

@@ -84,7 +84,7 @@
         <img height="40px" ng-src="{{serviceInfo.logo_url}}">
         <span style="color:#F06101">{{serviceInfo.channel}}</span>
         Service Info
-        <a ng-if="serviceInfo.channel=='RP跨境商城' || !serviceInfo.is_valid" type="button" ng-click="getGeekSsoLoginUrl()"
+        <a ng-if="serviceInfo.channel=='RP跨境商城' || !serviceInfo.incremental_id" type="button" ng-click="getGeekSsoLoginUrl()"
            style="cursor: pointer;text-decoration: underline;padding-left: 20px"> 前去跨境商城</a>
     </h1>
     <ol class="breadcrumb">
@@ -103,23 +103,23 @@
                         <div class="row">
                             <div class="col-sm-12">
                                 <div class="row">
-                                    <div class="col-sm-3" ng-if="serviceInfo.is_valid">
+                                    <div class="col-sm-3" ng-if="serviceInfo.incremental_id">
                                         <label>Mode:</label>
                                         <span>{{serviceInfo.incremental_mode==1?'固定手续费':'固定金额扣款' }}</span>
                                     </div>
-                                    <div class="col-sm-3" ng-if="serviceInfo.is_valid">
+                                    <div class="col-sm-3" ng-if="serviceInfo.incremental_id">
                                         <label>{{serviceInfo.incremental_mode==1?'附加手续费':'Amount'}}:</label>
                                         <span>{{serviceInfo.incremental_mode==1?serviceInfo.incremental_rate_value+'%':serviceInfo.total_incremental_amount}}</span>
                                     </div>
-                                    <div class="col-sm-3" ng-if="serviceInfo.is_valid">
+                                    <div class="col-sm-3" ng-if="serviceInfo.incremental_id">
                                         <label>Create Time:</label>
                                         <span>{{serviceInfo.create_time }}</span>
                                     </div>
-                                    <div class="col-sm-3" ng-if="serviceInfo.is_valid">
+                                    <div class="col-sm-3" ng-if="serviceInfo.incremental_id">
                                         <label>Status:</label>
                                         <span ng-style="{'color':serviceInfo.is_valid?'#00A65A':'#DD4B39'}">{{serviceInfo.is_valid?'已启用':'未启用' }}</span>
                                     </div>
-                                    <div class="col-sm-3" ng-if="!serviceInfo.is_valid">
+                                    <div class="col-sm-3" ng-if="!serviceInfo.incremental_id">
                                         <label>Status:</label>
                                         <span style="color:#00A65A">已启用</span>
                                     </div>