diff --git a/src/db/modify.sql b/src/db/modify.sql index df8029708..b98a58b8e 100644 --- a/src/db/modify.sql +++ b/src/db/modify.sql @@ -505,7 +505,33 @@ CREATE TABLE `sys_mail_send` ( PRIMARY KEY (`id`,`mail_address`), KEY `mail_address` (`mail_address`), KEY `id` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - - -alter table sys_clients add column mail_confirm tinyint(1) default '0' COMMENT '0: 未验证,1已验证'; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 + +alter table sys_clients add column mail_confirm tinyint(1) default '0' COMMENT '0: 未验证,1已验证'; + +CREATE TABLE `sys_client_pre_apply` ( + `client_pre_apply_id` int(11) NOT NULL, + `username` varchar(50) DEFAULT NULL, + `password` varchar(20) DEFAULT '', + `contact_person` varchar(50) DEFAULT NULL, + `contact_phone` varchar(20) DEFAULT '', + `contact_email` varchar(255) DEFAULT NULL, + `company_name` varchar(100) DEFAULT NULL, + `abn` varchar(20) DEFAULT NULL, + `short_name` varchar(50) DEFAULT NULL, + `address` varchar(200) DEFAULT NULL, + `suburb` varchar(50) DEFAULT NULL, + `state` varchar(20) DEFAULT NULL, + `postcode` varchar(20) DEFAULT NULL, + `industry` varchar(50) DEFAULT NULL, + `bank_no` varchar(20) DEFAULT NULL, + `bank_name` varchar(50) DEFAULT NULL, + `bsb_no` varchar(6) DEFAULT NULL, + `clean_days` smallint(6) DEFAULT NULL, + `create_time` datetime DEFAULT NULL, + `update_time` datetime DEFAULT NULL, + `agree` tinyint(1) DEFAULT NULL, + `company_phone` varchar(20) DEFAULT NULL, + PRIMARY KEY (`client_pre_apply_id`), + UNIQUE KEY `username` (`username`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; \ No newline at end of file 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 8ca50c67a..113072ffa 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,8 @@ public class ClientPreApplyBean { @NotEmpty(message = "agree can't be null") private boolean agree; + private String codeKey; + public JSONObject insertObject() { JSONObject res = (JSONObject) JSON.toJSON(this); return res; diff --git a/src/main/ui/static/merchantapplication/merchant_application.js b/src/main/ui/static/merchantapplication/merchant_application.js index 83747ca07..9326ecf79 100644 --- a/src/main/ui/static/merchantapplication/merchant_application.js +++ b/src/main/ui/static/merchantapplication/merchant_application.js @@ -216,6 +216,9 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl', }); return; } + if(index == 1){ + $scope.partner.codeKey = Math.random().toString(16).substring(2); + } $http.post('/register/info/update/' + $scope.partner.username, $scope.partner).then(function (resp) { if (index == 3) { $scope.getRateConfig();