Merge branch 'xggsve-merchant' of gitlab.gongsibao.com:jiangyong/zhichan into xggsve-merchant

xggsve-merchant/app/base/db/models/main/saasmain.js

@@ -7,6 +7,9 @@ module.exports = (db, DataTypes) => {
     bank_account: DataTypes.STRING,
     bank_account: DataTypes.STRING,
     bank_name: DataTypes.STRING,
     bank_name: DataTypes.STRING,
     bank_no: DataTypes.STRING,
     bank_no: DataTypes.STRING,
+    mobile : DataTypes.STRING,
+    addr : DataTypes.STRING,
+    credit_code : DataTypes.STRING,
     is_enabled: {
     is_enabled: {
       type: DataTypes.BOOLEAN,
       type: DataTypes.BOOLEAN,
       defaultValue: true
       defaultValue: true

xggsve-merchant/app/base/service/impl/main/saasmainSve.js

@@ -37,6 +37,9 @@ class SaasMainService extends ServiceBase {
     let bank_account = this.trim(params.bank_account);
     let bank_account = this.trim(params.bank_account);
     let bank_name = this.trim(params.bank_name);
     let bank_name = this.trim(params.bank_name);
     let bank_no = this.trim(params.bank_no);
     let bank_no = this.trim(params.bank_no);
+    let credit_code = this.trim(params.credit_code);
+    let addr = this.trim(params.addr);
+    let mobile = this.trim(params.mobile);
     let main;
     let main;
     if (id) {
     if (id) {
       main = await this.dao.findById(id);
       main = await this.dao.findById(id);
@@ -44,6 +47,9 @@ class SaasMainService extends ServiceBase {
       main.bank_account = bank_account;
       main.bank_account = bank_account;
       main.bank_name = bank_name;
       main.bank_name = bank_name;
       main.bank_no = bank_no;
       main.bank_no = bank_no;
+      main.credit_code = credit_code;
+      main.addr = addr;
+      main.mobile = mobile;
       await main.save();
       await main.save();
     } else {
     } else {
       main = {
       main = {
@@ -53,6 +59,9 @@ class SaasMainService extends ServiceBase {
         bank_no: bank_no,
         bank_no: bank_no,
         is_enabled: true,
         is_enabled: true,
         saas_id: saas_id,
         saas_id: saas_id,
+        mobile :mobile,
+        addr : addr,
+        credit_code :credit_code,
       };
       };
       main = await this.dao.model.create(main);
       main = await this.dao.model.create(main);
     }
     }
@@ -101,4 +110,4 @@ module.exports = SaasMainService;
 //   console.log((result));
 //   console.log((result));
 // }).catch(function(e){
 // }).catch(function(e){
 //   console.log(e);
 //   console.log(e);
-// });
+// });
\ No newline at end of file