From a827c30bc9e3d5484eeb01e2ead02332fc00c3c1 Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Fri, 24 Sep 2021 18:58:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/document/openapi/cn/components_order.yml       | 14 ++++----------
 src/document/openapi/en/components_order.yml       | 14 ++++----------
 .../impls/PlatformClearAnalysisServiceImpl.java    |  6 +++---
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/document/openapi/cn/components_order.yml b/src/document/openapi/cn/components_order.yml
index d464005e9..b142a74b4 100644
--- a/src/document/openapi/cn/components_order.yml
+++ b/src/document/openapi/cn/components_order.yml
@@ -382,23 +382,17 @@ consultResultItemAlipayPlus:
   type: object
   required:
     - sub_channel
-    - enabled
+    - sub_channel_name
   properties:
     sub_channel:
       type: string
       description: 钱包名称，用于作为pay_type参数传递给下单api
-    enabled:
-      type: boolean
-      description: 是否可用
-    preferred:
-      type: boolean
-      description: 是否推荐
+    sub_channel_name:
+      type: string
+      description: 钱包品牌名称，用于展示
     logo:
       type: string
       description: 钱包logo图片地址
-    disable_reason:
-      type: string
-      description: 钱包不可用原因
 customInfo:
   type: object
   properties:
diff --git a/src/document/openapi/en/components_order.yml b/src/document/openapi/en/components_order.yml
index 682780e25..682cd86f2 100644
--- a/src/document/openapi/en/components_order.yml
+++ b/src/document/openapi/en/components_order.yml
@@ -379,23 +379,17 @@ consultResultItemAlipayPlus:
   type: object
   required:
     - sub_channel
-    - enabled
+    - sub_channel_name
   properties:
     sub_channel:
       type: string
       description: wallet name. should be passed as pay_type parameter in new order requests
-    enabled:
-      type: boolean
-      description: is this wallet available to use
-    preferred:
-      type: boolean
-      description: is this wallet recommended
+    sub_channel_name:
+      type: string
+      description: wallet brand name which can be display to customers
     logo:
       type: string
       description: wallet logo
-    disable_reason:
-      type: string
-      description: reason for why this wallet was unable to use
 customInfo:
   type: object
   properties:
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java
index 32ce78bd2..bad33c583 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java
@@ -212,7 +212,7 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
             try {
                 tencentSettle = mpPaymentApi.settlementLogs(settleDate.get("from"), settleDate.get("to"), mch.getMerchantId());
                 if (tencentSettle == null) {
-                    logger.info("【" + mch.getMerchantId() + "】下没有清算记录");
+                    logger.info("【{}】下没有清算记录", mch.getMerchantId());
                 } else {
                     for (SettlementLog settle : tencentSettle) {
                         JSONObject params = new JSONObject();
@@ -246,11 +246,11 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
                             platformSettlementMapper.save(params);
                         }
                         params.clear();
-                        logger.info(mch.getMerchantId() + "的微信清算记录查询完成");
+                        logger.info("{}的微信清算记录查询完成", mch.getMerchantId());
                     }
                 }
             } catch (Exception e) {
-                logger.error("【" + mch.getMerchantId() + "】下没有清算记录", e);
+                logger.error("【{}】下没有清算记录", mch.getMerchantId(), e);
             }
         }
     }