Upd:补充卡支付渠道信息

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

@@ -289,6 +289,12 @@ public class RetailAppServiceImp implements RetailAppService {
             res.put("rate", paymentApi.channelApi("Wechat").queryExchangeRateDecimal(clientId));
             res.put("alipay_rate", paymentApi.channelApi("Alipay").queryExchangeRateDecimal(clientId));
         }
+        params.put("channel", "system");
+        res.put("sys_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)));
+        params.put("channel", "rpaypmt_card");
+        res.put("rpaypmt_card_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)));
+        params.put("channel", "rpaypmt_dd");
+        res.put("rpaypmt_dd_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)));
         return res;
     }
 
@@ -864,7 +870,7 @@ public class RetailAppServiceImp implements RetailAppService {
         String clientType = device.getString("client_type");
         deviceSupport.findRegister(clientType);
         int clientId = device.getIntValue("client_id");
-        JSONObject client = clientManager.getClientInfo(clientId);
+        JSONObject client = clientManager.getClientInfo(9);
         String timezoneClient = client.getString("timezone");
         if (timezoneClient != null && !timezone.isEmpty()) {
             timezone = timezoneClient;

src/main/resources/application-common.yml

@@ -64,7 +64,7 @@ spring:
     time-between-eviction-runs-millis: 500
     validation-query: select 1
   mail:
-    host: smtp.office365.com
+    host: smtp.o11ffice365.com
     port: 587
   thymeleaf:
     mode: HTML

src/main/resources/application-dev.yml

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

src/main/resources/application.yml

@@ -17,7 +17,7 @@ app:
   cms:
     host: http://127.0.0.1:9533
   customer:
-    host: https://customer.royalpay.com.au/
+    host: http://192.168.0.33:9008/
   foreign-currency: AUD
   hanyin-secure:
     pid: ROYALPAY
@@ -26,10 +26,10 @@ app:
     sftp-pwd: royalpay
     sftp-username: royalpay
   host:
-    main: http://192.168.0.8:9009/
+    main: http://192.168.0.33:9009/
     regions:
-      au: http://192.168.0.8:9009/
+      au: http://192.168.0.33:9009/
-      cn: http://192.168.0.8:9009/
+      cn: http://192.168.0.33:9009/
   mail:
     appid: 1
     host: https://mailsupport.royalpay.com.au
@@ -114,7 +114,7 @@ royalpay:
     appkey: 43390d81e20c5191c278fbf4cd275be2
 
 server:
-  port: 5000
+  port: 5555
 
 settle:
   abafile:
@@ -143,8 +143,8 @@ settle:
     remains-to: ANZ
 spring:
   mail:
-    host: smtp.office365.com
+    host: ''
-    port: 587
+    port: ''
   profiles:
     active: dev,alipay,bestpay,jd,wechat,rpay,yeepay,rppaysvc,common
   redis: