From 541a74da48b4831aef4881d6ad7aeea152389da1 Mon Sep 17 00:00:00 2001
From: dalong306 <304592994@qq.com>
Date: Thu, 1 Apr 2021 14:09:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=AD=90=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/manage/merchants/beans/NewSubMerchantIdApply.java  | 2 ++
 src/main/ui/static/payment/partner/partner-manage.js           | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/NewSubMerchantIdApply.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/NewSubMerchantIdApply.java
index 87da7c5f0..d39440dfd 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/NewSubMerchantIdApply.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/NewSubMerchantIdApply.java
@@ -89,6 +89,7 @@ public class NewSubMerchantIdApply {
 
     private String sub_mch_id;
 
+    @JSONField(name = "merchant_remark")
     private String merchantRemark;
 
     public JSONObject insertObject(JSONObject client) {
@@ -174,6 +175,7 @@ public class NewSubMerchantIdApply {
             json.put("principal_id_number",subMerchantApplyInfo.getPrincipalIdNumber());
             json.put("business_type",subMerchantApplyInfo.getBusinessType());
             json.put("sub_merchant_id",subMerchantApplyInfo.getSubMerchantId());
+            json.put("merchant_remark",subMerchantApplyInfo.getMerchantRemark());
         });
     }
 
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 14568b25c..b0c25ba16 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -7029,7 +7029,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             } else if ($scope.merchantInfo.certificat_expire_date == 'N/A') {
                 $scope.subMerchantInfo.certificat_expire_date_NA = true
             } else {
-                var datestr = subMerchantInfo.certificat_expire_date.replace(/-/g, '/')
+                var datestr = $scope.merchantInfo.certificat_expire_date.replace(/-/g, '/')
                 $scope.subMerchantInfo.certificat_expire_date_d = new Date(datestr)
             }
         }
@@ -7093,6 +7093,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
           address: $scope.subMerchantInfo.address,
           business_type: $scope.subMerchantInfo.business_type,
           sub_mch_id: $scope.subMerchantInfo.sub_merchant_id,
+          merchant_remark: $scope.subMerchantInfo.merchant_remark,
         }
         if (params.business_type == 'ONLINE') {
           params.address = null