From f4da89ddcdcb02a4188e449ef1910e39ceb86678 Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Mon, 28 May 2018 09:44:42 +0800 Subject: [PATCH 01/11] fix~ --- .../manage/merchants/core/ClientManager.java | 2 + .../core/impls/ClientManagerImpl.java | 10 + .../merchants/web/PartnerViewController.java | 16 ++ .../ui/static/dashboard/partner-dashboard.js | 16 ++ .../templates/partner_dashboard.html | 85 ++++++- src/main/ui/static/payment/partner/partner.js | 223 ++++++++++++++++++ .../templates/client_partner_detail.html | 4 + 7 files changed, 355 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java index 6ab259398..febcab7e8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java @@ -292,4 +292,6 @@ public interface ClientManager { List getClientSubMerchantIdLogs(String clientMoniker,JSONObject manager); void applyToCompliance(String client_moniker, JSONObject account); + + void sendVerifyEmail(JSONObject client,String accountId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 631b59bc6..dc24bbd93 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -11,6 +11,7 @@ import au.com.royalpay.payment.core.exceptions.InvalidShortIdException; import au.com.royalpay.payment.core.utils.OrderExpiryRuleResolver; import au.com.royalpay.payment.manage.analysis.mappers.TransactionAnalysisMapper; import au.com.royalpay.payment.manage.appclient.beans.AppClientBean; +import au.com.royalpay.payment.manage.application.core.SimpleClientApplyService; import au.com.royalpay.payment.manage.device.core.DeviceManager; import au.com.royalpay.payment.manage.mappers.financial.FinancialBDConfigMapper; import au.com.royalpay.payment.manage.mappers.log.ClientsOperationLogMapper; @@ -264,6 +265,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid @Resource private ClientInfoCacheSupport clientInfoCacheSupport; + + @Resource + private SimpleClientApplyService simpleClientApplyService; @Resource private MongoTemplate mongoTemplate; @Resource @@ -3439,4 +3443,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid sendCommissionWechatMessage(client); } } + + @Override + public void sendVerifyEmail(JSONObject client,String accountId) { + JSONObject clientAccount = clientAccountMapper.findByOpenId(accountId); + simpleClientApplyService.sendVerifyEmail(client.getString("contact_email"),client.getIntValue("client_id"),clientAccount.getString("username")); + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java index 3ecfa512b..f63140483 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java @@ -1,6 +1,7 @@ package au.com.royalpay.payment.manage.merchants.web; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; +import au.com.royalpay.payment.manage.application.core.SimpleClientApplyService; import au.com.royalpay.payment.manage.merchants.beans.NewAccountBean; import au.com.royalpay.payment.manage.merchants.core.ClientManager; import au.com.royalpay.payment.manage.merchants.core.ClientSignEventSupport; @@ -57,6 +58,9 @@ public class PartnerViewController { @Resource private ClientContractService clientContractService; + @Resource + private SimpleClientApplyService simpleClientApplyService; + @RequestMapping(method = RequestMethod.GET) @RequirePartner @ResponseBody @@ -385,4 +389,16 @@ public class PartnerViewController { public void commitAudit(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account) { clientManager.applyToCompliance(account.getString("client_moniker"),account); } + + @PartnerMapping(value = "/compliance/files", method = RequestMethod.GET) + @ResponseBody + public JSONObject complianceFile(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account) { + return clientManager.getAuthFiles(null,account.getString("client_moniker")); + } + + @PartnerMapping(value = "/verify/email", method = RequestMethod.PUT) + @ResponseBody + public void sendVerifyEmail(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account) { + clientManager.sendVerifyEmail(account.getJSONObject("client"),account.getString("account_id")); + } } diff --git a/src/main/ui/static/dashboard/partner-dashboard.js b/src/main/ui/static/dashboard/partner-dashboard.js index c2a26c267..f59de9e04 100644 --- a/src/main/ui/static/dashboard/partner-dashboard.js +++ b/src/main/ui/static/dashboard/partner-dashboard.js @@ -914,6 +914,22 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct $scope.getClearingTransactions = function (client_id, detailId) { clearingDetailService.clientClearingDetail(client_id, detailId, true) }; + $scope.checkStartGuidance = function () { + $http.get('/client/partner_info/compliance/file').then(function (resp) { + $scope.complianceFiles = resp.data; + if( $scope.complianceFiles.file_bank_info != null && $scope.complianceFiles.file_company_info != null){ + if($scope.complianceFiles.file_id_info != null && $scope.complianceFiles.file_agreement_info != null && $scope.complianceFiles.file_apply_info != null){ + $scope.toCommitFiles = false; + } + } + }); + }; + $scope.checkStartGuidance(); + $scope.checkEmail = function () { + $http.put('/client/partner_info/verify/email').then(function (resp) { + $scope.manual_settle = resp.data.manual_settle; + }) + } }]); app.controller('exchangeRateHistoryDialogCtrl', ['$scope', '$http', '$filter', 'chartParser', function ($scope, $http, $filter, chartParser) { diff --git a/src/main/ui/static/dashboard/templates/partner_dashboard.html b/src/main/ui/static/dashboard/templates/partner_dashboard.html index 999479e12..955b98681 100644 --- a/src/main/ui/static/dashboard/templates/partner_dashboard.html +++ b/src/main/ui/static/dashboard/templates/partner_dashboard.html @@ -180,8 +180,26 @@ .mini-stat-info span{ font-size: 18px; } - + .start_item{ + line-height: 50px; + } + .start_ico{ + display: inline-block; + line-height: 50px; + font-size: 30px; + vertical-align: middle; + color: #6fd088; + } + .start_text{ + line-height: 50px; + display: inline-block; + vertical-align: baseline; + } + .start_email{ + font-size: 15px; + } +

Dashboard @@ -201,6 +219,71 @@

+
+
+
+
+

Tips: Started with RoyalPay

+
+
+
+
+ +
+
+

+  验证邮箱 {{partner.contact_email}} + + +

+
+
+ +
+
+ +
+
+

  + + 完善商户信息 + +

+
+
+
+
+ +
+
+

  + + 提交合规材料 + +

+
+
+
+
+ +
+
+

  + + 查看《用户手册》 + +

+
+
+
+ 在账户完成认证审核之前，所有进行的交易不会进行清算，若有疑问，请联系我们的客服! +
+
+
+
+
diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js index c60e038ad..4a32d3d00 100644 --- a/src/main/ui/static/payment/partner/partner.js +++ b/src/main/ui/static/payment/partner/partner.js @@ -15,10 +15,23 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct return $http.get('/client/partner_info'); }] } + }).state('basic.payment_info_edit', { + url: '/payment/edit', + templateUrl: '/static/payment/partner/templates/client_partner_edit.html', + controller: 'clientPaymentInfoEditCtrl' }).state('basic.payment_info', { url: '/payment', templateUrl: '/static/payment/partner/templates/client_payment_info.html', controller: 'clientPaymentInfoCtrl' + }).state('basic.compliance_files', { + url: '/{client_moniker}/compliance_files', + templateUrl: '/static/payment/partner/templates/client_compliance_files.html', + controller: 'clientComplianceFilesCtrl', + resolve: { + file: ['$http', function ($http) { + return $http.get('/client/partner_info/compliance/file'); + }] + } }).state('payment_materials', { url: '/payment_materials', templateUrl: '/static/payment/partner/templates/client_payment_materials.html', @@ -55,6 +68,216 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct ); } }]); + app.controller('clientPaymentInfoEditCtrl', ['$scope', '$http', 'partner','industryMap', function ($scope, $http, partner,industryMap) { + + }]); + app.controller('clientComplianceFilesCtrl', ['$scope', '$http', '$rootScope', 'commonDialog', '$state', 'Upload', 'file', function ($scope, $http, $rootScope, commonDialog, $state, Upload, file) { + + $scope.file = file.data || {}; + //audit files + $scope.uploadBankFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.bankFileProgress = {value: 0}; + Upload.upload({ + url: '/attachment/files', + data: {file: file} + }).then(function (resp) { + delete $scope.bankFileProgress; + $scope.file.file_bank_info = resp.data.url; + $scope.updateFile(); + if ($scope.file.file_bank_info.endsWith('pdf')) { + $scope.bankIsImage = false; + } else { + $scope.bankIsImage = true; + } + }, function (resp) { + delete $scope.bankFileProgress; + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, function (evt) { + $scope.bankFileProgress.value = parseInt(100 * evt.loaded / evt.total); + }) + } + } + }; + $scope.agreeIsImage = true; + if ($scope.file.file_agreement_info && $scope.file.file_agreement_info.endsWith('pdf')) { + $scope.agreeIsImage = false; + } + $scope.bankIsImage = true; + if ($scope.file.file_bank_info && $scope.file.file_bank_info.endsWith('pdf')) { + $scope.bankIsImage = false; + } + $scope.companyIsImage = true; + if ($scope.file.file_company_info && $scope.file.file_company_info.endsWith('pdf')) { + $scope.companyIsImage = false; + } + $scope.applyIsImage = true; + if ($scope.file.file_apply_info && $scope.file.file_apply_info.endsWith('pdf')) { + $scope.applyIsImage = false; + } + $scope.idIsImage = true; + if ($scope.file.file_id_info && $scope.file.file_id_info.endsWith('pdf')) { + $scope.idIsImage = false; + } + + $scope.uploadCompanyFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.companyFileProgress = {value: 0}; + Upload.upload({ + url: '/attachment/files', + data: {file: file} + }).then(function (resp) { + delete $scope.companyFileProgress; + $scope.file.file_company_info = resp.data.url; + $scope.updateFile(); + if ($scope.file.file_company_info.endsWith('pdf')) { + $scope.companyIsImage = false; + } else { + $scope.companyIsImage = true; + } + }, function (resp) { + delete $scope.companyFileProgress; + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, function (evt) { + $scope.companyFileProgress.value = parseInt(100 * evt.loaded / evt.total); + }) + } + } + }; + //上传ID信息 + $scope.uploadIDFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.idFileProgress = {value: 0}; + Upload.upload({ + url: '/attachment/files', + data: {file: file} + }).then(function (resp) { + delete $scope.idFileProgress; + $scope.file.file_id_info = resp.data.url; + $scope.updateFile(); + if ($scope.file.file_id_info.endsWith('pdf')) { + $scope.idIsImage = false; + } else { + $scope.idIsImage = true; + } + }, function (resp) { + delete $scope.idFileProgress; + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, function (evt) { + $scope.idFileProgress.value = parseInt(100 * evt.loaded / evt.total); + }) + } + } + }; + + //上传协议文件 + $scope.uploadAgreementFile = function (file) { + if (file != null) { + if (file.size > 10 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过5MB，请压缩后重试', type: 'error'}) + } else { + $scope.agreementFileProgress = {value: 0}; + Upload.upload({ + url: '/attachment/files', + data: {file: file} + }).then(function (resp) { + delete $scope.agreementFileProgress; + $scope.file.file_agreement_info = resp.data.url; + $scope.updateFile(); + if ($scope.file.file_agreement_info.endsWith('pdf')) { + $scope.agreeIsImage = false; + } else { + $scope.agreeIsImage = true; + } + }, function (resp) { + delete $scope.agreementFileProgress; + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, function (evt) { + $scope.agreementFileProgress.value = parseInt(100 * evt.loaded / evt.total); + }) + } + } + }; + + //上传申请表 + $scope.uploadApplyFile = function (file) { + if (file != null) { + if (file.size > 3 * 1024 * 1024) { + commonDialog.alert({title: 'Error', content: '文件大小不能超过3MB，请压缩后重试', type: 'error'}) + } else { + $scope.applyFileProgress = {value: 0}; + Upload.upload({ + url: '/attachment/files', + data: {file: file} + }).then(function (resp) { + delete $scope.applyFileProgress; + $scope.file.file_apply_info = resp.data.url; + $scope.updateFile(); + if ($scope.file.file_apply_info.endsWith('pdf')) { + $scope.applyIsImage = false; + } else { + $scope.applyIsImage = true; + } + }, function (resp) { + delete $scope.applyFileProgress; + commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'}) + }, function (evt) { + $scope.applyFileProgress.value = parseInt(100 * evt.loaded / evt.total); + }) + + } + } + }; + + /* $scope.downloadAsZip = function () { + var url = '/sys/partners/' + $scope.partner.client_moniker + '/download/complianceAsZIP'; + return url; + }; +*/ + $scope.updateFile = function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/file', $scope.file).then(function () { + commonDialog.alert({ + title: 'Success', + content: 'Upload Successful', + type: 'success' + }); + $state.reload(); + }, function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); + }) + }; + + function commitError() { + commonDialog.alert({ + title: 'Error', + content: 'Missing file', + type: 'error' + }); + }; + $scope.commitPartner = function () { + if ($scope.file) { + if ($scope.file.file_bank_info != null && $scope.file.file_company_info != null && $scope.file.file_id_info != null && $scope.file_apply_info != null) { + $http.put('/client/partner_info/compliance_audit').then(function (resp) { + + }); + } else { + commitError(); + } + } else { + commitError(); + } + }; + }]); + app.controller('clientPaymentInfoCtrl', ['$scope', '$http', 'commonDialog', function ($scope, $http, commonDialog) { $scope.paymentInfo = $scope.partner; $scope.old_customer_surcharge_rate = angular.copy($scope.partner.customer_surcharge_rate); diff --git a/src/main/ui/static/payment/partner/templates/client_partner_detail.html b/src/main/ui/static/payment/partner/templates/client_partner_detail.html index cd34f8e31..9f293187d 100644 --- a/src/main/ui/static/payment/partner/templates/client_partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/client_partner_detail.html @@ -22,6 +22,10 @@
  • Clearing Config
    • + +
  • + Compliance files +
    • From 299f69957ae096218d7256714128feceb04c4746 Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Mon, 28 May 2018 09:45:29 +0800 Subject: [PATCH 02/11] fix~ --- .../templates/client_compliance_files.html | 162 +++++++++ .../templates/client_partner_edit.html | 340 ++++++++++++++++++ 2 files changed, 502 insertions(+) create mode 100644 src/main/ui/static/payment/partner/templates/client_compliance_files.html create mode 100644 src/main/ui/static/payment/partner/templates/client_partner_edit.html diff --git a/src/main/ui/static/payment/partner/templates/client_compliance_files.html b/src/main/ui/static/payment/partner/templates/client_compliance_files.html new file mode 100644 index 000000000..5d85b8e90 --- /dev/null +++ b/src/main/ui/static/payment/partner/templates/client_compliance_files.html @@ -0,0 +1,162 @@ + +
    +
    Audit Files     + + + 一键下载 + +
    +
    +
    +
    + +
    +
    + + + +
    + + + +
    +
    +
    +

    Example：请保证图片信息清晰可见,如下图

    + +
    +
    +
    + +
    + +
    +
    + + + +
    + + + +
    +
    +
    +
    +

    Example：公司请提供以下文件图片

    + + +
    +
    +

    sole trade（个体户),partnership（合伙）,trust（信托）请在http://abr.business.gov.au，将查询结果截图上传

    + +
    +
    +
    +
    + +
    + +
    +
    + + + +
    + + + +
    +
    +
    +
    +

    Example：请保证图片(护照或驾照)信息清晰可见,如下图

    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    + + + +
    + + + +
    +
    +
    +

    Example：请保证图片信息清晰可见,如下图

    + +
    +
    +
    +
    + +
    +
    + +
    +
    + + + +
    + + + +
    +
    +
    +

    Example：请保证图片信息清晰可见,如下图

    + +
    +
    +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/src/main/ui/static/payment/partner/templates/client_partner_edit.html b/src/main/ui/static/payment/partner/templates/client_partner_edit.html new file mode 100644 index 000000000..7ff035eb9 --- /dev/null +++ b/src/main/ui/static/payment/partner/templates/client_partner_edit.html @@ -0,0 +1,340 @@ + +
    +
    Partner Basic Information
    +
    +
    +
    + +
    +

    +
    +
    +
    + +
    + +

    Full Name shall be same as the name when register to + gov

    +
    +

    Required Field

    +

    Less Than 100 + Characters(including symbols and spaces)

    +
    +
    +
    +
    + +
    + +

    short name for WeChat payment display and partner + name

    +
    +

    Required Field

    +

    Less Than 50 + Characters(including symbols and spaces)

    +
    +
    +
    +
    + +
    + +
    +

    Less Than 100 + Characters(including symbols and spaces)

    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    + + +
    +
    +
    + +
    + +
    +

    Less Than 20 + Characters(including symbols and spaces)

    +
    +
    +
    +
    + +
    + +
    +

    Less Than 20 + Characters(including symbols and spaces)

    +
    +
    +
    +
    + +
    + +

    If the partner is a offline shop then a photo of shop is + required while an online store shall choose company website

    +

    + 只要有可能产生线下交易（商户静态码、POS），就必须上传照片，否则支付宝会禁止交易

    +
    +

    Required Field

    +
    +
    +
    +
    + +
    +
    1:  + +
    + + +
    +
    +
    2:  + +
    + + +
    +
    +
    + +
    + +
    +

    Required Field

    +

    Less Than 200 + Characters(including symbols and spaces)

    +
    +
    +
    +
    + +
    + +
    +

    Required Field

    +

    Less Than 20 Characters

    +
    +
    +
    +
    + +
    + +
    +

    Less Than 200 + Characters(including symbols and spaces)

    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + + +
    +
    Contact Information
    +
    +
    +
    + +
    + +
    +

    Required Field

    +

    Less Than 50 + Characters(including symbols and spaces)

    +
    +
    +
    +
    + +
    + +
    +
    +

    Required Field

    +

    Less Than 20 + Characters(including symbols and spaces)

    +
    +
    +
    + +
    + +
    +
    +

    Required Field

    +

    Less Than 50 + Characters(including symbols and spaces)

    +
    +
    +
    +
    +
    + + +
    +
    Address Information
    +
    +
    +
    + +
    + +
    +

    Less Than 200 + Characters(including symbols and spaces)

    +
    +
    +
    +
    + +
    + +
    +

    Less Than 50 + Characters(including symbols and spaces)

    +
    +
    +
    +
    + +
    + +
    +

    Less Than 10 + Characters(including symbols and spaces)

    +
    +
    +
    +
    + +
    + +
    +

    Required Field

    +
    +
    +
    +
    + +
    + +
    +

    Less Than 20 + Characters(including symbols and spaces)

    +

    Required Field

    +
    +
    +
    +
    +
    +
    +
    + + Back +
    From 483b3aa9c12991896de83fdd3d97eee4279b7d14 Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Mon, 28 May 2018 17:57:59 +0800 Subject: [PATCH 03/11] fix~ --- .../application/beans/ClientPreApplyBean.java | 9 +++++++ .../impls/SimpleClientApplyServiceImpl.java | 3 ++- src/main/ui/merchant_application.html | 26 +++++++++++-------- .../merchant_application.js | 19 ++++++++++++++ 4 files changed, 45 insertions(+), 12 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java b/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java index d00e8e90a..8f2f4c2be 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java @@ -52,6 +52,7 @@ public class ClientPreApplyBean { @NotEmpty(message = "codeKey can't be null") private String codeKey; private boolean agree; + private String nation_code; public JSONObject insertObject() { JSONObject res = (JSONObject) JSON.toJSON(this); @@ -225,4 +226,12 @@ public class ClientPreApplyBean { public void setCodeKey(String codeKey) { this.codeKey = codeKey; } + + public String getNation_code() { + return nation_code; + } + + public void setNation_code(String nation_code) { + this.nation_code = nation_code; + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java index 08dcef328..c143932bb 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java @@ -275,6 +275,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { sysClient.put("create_time",new Date()); sysClient.put("source",4); sysClient.put("approve_result",2); + sysClient.put("approve_time",new Date()); sysClient.put("creator",0); sysClient.put("industry",331); sysClient.put("merchant_id",subMerchantId.getString("merchant_id")); @@ -293,10 +294,10 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { sysAccount.put("password_aes", PasswordUtils.encryptAESPwd(apply.getString("password"))); sysAccount.put("creator",0); sysAccount.put("contact_phone",apply.getString("contact_phone")); - sysAccount.put("password_hash",apply.getString("password")); sysAccount.put("client_id",clientId); sysAccount.put("create_time",new Date()); sysAccount.put("is_password_expired",0); + sysAccount.put("nation_code",'+'+apply.getString("nation_code")); clientAccountMapper.save(sysAccount); JSONObject sysBank = new JSONObject(); diff --git a/src/main/ui/merchant_application.html b/src/main/ui/merchant_application.html index acaa3d2be..9d0e03224 100644 --- a/src/main/ui/merchant_application.html +++ b/src/main/ui/merchant_application.html @@ -272,7 +272,7 @@
    + required maxlength="50" name="contact_email" ng-mouseleave="checkParams()" ng-mousedown="trueEmail =false">

    The mailbox is incorrect

    @@ -285,11 +285,14 @@ +61 + placeholder="Your Phone" maxlength="20" ng-mouseleave="checkParams()" ng-mousedown="name_exist =false">
    +
    + The phone number has already existed +
    phone number is also your login id
    @@ -299,7 +302,7 @@
    + required maxlength="10" name="code" ng-click="checkParams()">
    + placeholder="Company Name" required maxlength="80">
    @@ -344,17 +347,17 @@
    + placeholder="Merchant Name" required maxlength="50">
    + placeholder="Company phone" required maxlength="20">
    + name="address" required maxlength="200">
    + maxlength="10" name="postcode">
    @@ -382,7 +385,7 @@
    + maxlength="50" name="royalpayindustry" readonly="readonly">