微信子商户申请 修改

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());
         });
     }
 

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