Upd:信用卡合同国际费用显示修改

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1</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

@@ -7149,7 +7149,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         info.put("annual_rate", cardAnnualRate);//年费率
         info.put("cost_per_transaction", clientRate.getString("transaction_fee"));//每次交易成本
         info.put("domestic_fee", cardRate.getString("domestic_rate_value"));//国内服务费
-        info.put("international_fee", cardRate.getString("overseas_rate_value"));//国际服务费
+        info.put("international_fee", upayProfileInfo.getBoolean("enable_international_card")?cardRate.getString("overseas_rate_value"):"-");//国际服务费
         BigDecimal reserve = (upayProfileInfo.getBigDecimal("expected_card_revenue").multiply(new BigDecimal(0.005)).setScale(0, RoundingMode.HALF_UP));
         info.put("account_reserve", reserve.compareTo(new BigDecimal(200)) <= 0 ? new BigDecimal(200).toPlainString() : reserve.toPlainString());//账户储备金
         //银行账号信息
@@ -7184,6 +7184,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
         JSONObject cardRate = clientRate.getJSONObject("ext_rates");
         JSONObject legalInfo = sysClientLegalPersonMapper.findRepresentativeInfo(clientId);
+        JSONObject upayProfileInfo = sysClientUpayProfileMapper.findInfo(clientId);
 
         JSONObject info = new JSONObject();
         info.put("down_date", convertDateEnglish(new Date()));//下载文件日期
@@ -7194,7 +7195,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         info.put("partner_bussiness_name", client.getString("business_name"));//商户商用名称
         info.put("legal_bussiness", legalInfo.getString("representative_person") + " AS " + (client.containsKey("business_name") ? client.getString("business_name") : legalInfo.getString("representative_person")) + " ABN " + client.getString("abn"));//拼接规则:法人名 AS 商用名称 ABD 编码
         info.put("domestic_fee", cardRate.getString("domestic_rate_value"));//国内服务费
-        info.put("international_fee", cardRate.getString("overseas_rate_value"));//国际服务费
+        info.put("international_fee", upayProfileInfo.getBoolean("enable_international_card")?cardRate.getString("overseas_rate_value"):"-");//国际服务费
         info.put("promotional_effective_date", promotionalEffectiveDate);
         info.put("promotional_period", promotionalPeriod);
         return info;

src/main/resources/application-dev.yml

@@ -3,13 +3,13 @@ spring:
     master:
       host: 192.168.0.84:3306
       jdbc-url: jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
-      password: rpayplus
+      password: rpayplus123
       schema-name: royalpay
       username: root
     slave:
       host: 192.168.0.84:3306
       jdbc-url: jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
-      password: rpayplus
+      password: rpayplus123
       schema-name: royalpay
       username: root
     type: com.zaxxer.hikari.HikariDataSource