gsb

xggsve-merchant/app/base/db/models/merchant/saasmerchantsign.js

-const system=require("../../../system");
-const settings=require("../../../../config/settings");
-const uiconfig=system.getUiConfig2(settings.appKey);
+const system = require("../../../system");
+const settings = require("../../../../config/settings");
+const uiconfig = system.getUiConfig2(settings.appKey);
 module.exports = (db, DataTypes) => {
   return db.define("saasmerchantsign", {
-    main_id: DataTypes.INTEGER,
+    main_id: DataTypes.STRING,
+    main_id_trade: DataTypes.STRING,
     begin_date: DataTypes.DATE,
     end_date: DataTypes.DATE,
     bm_reg_price: DataTypes.INTEGER,
     invoice_service_rate: DataTypes.INTEGER,
     trans_service_rate: DataTypes.INTEGER,
-  },{
-     paranoid: true,//假的删除
-     underscored: true,
-     version: true,
-     freezeTableName: true,
-     //freezeTableName: true,
-     // define the table's name
-     tableName: 'saas_merchant_sign',
-     validate: {
-     },
-     indexes:[
-       // Create a unique index on email
-        //  {
-        //    unique: true,
-        //    fields: ['email']
-        //  },
-         //
-        //  // Creates a gin index on data with the jsonb_path_ops operator
-        //  {
-        //    fields: ['data'],
-        //    using: 'gin',
-        //    operator: 'jsonb_path_ops'
-        //  },
-         //
-        //  // By default index name will be [table]_[fields]
-        //  // Creates a multi column partial index
-        //  {
-        //    name: 'public_by_author',
-        //    fields: ['author', 'status'],
-        //    where: {
-        //      status: 'public'
-        //    }
-        //  },
-         //
-        //  // A BTREE index with a ordered field
-        //  {
-        //    name: 'title_index',
-        //    method: 'BTREE',
-        //    fields: ['author', {attribute: 'title', collate: 'en_US', order: 'DESC', length: 5}]
-        //  }
-     ]
+  }, {
+    paranoid: true,//假的删除
+    underscored: true,
+    version: true,
+    freezeTableName: true,
+    //freezeTableName: true,
+    // define the table's name
+    tableName: 'saas_merchant_sign',
+    validate: {},
+    indexes: [
+      // Create a unique index on email
+      //  {
+      //    unique: true,
+      //    fields: ['email']
+      //  },
+      //
+      //  // Creates a gin index on data with the jsonb_path_ops operator
+      //  {
+      //    fields: ['data'],
+      //    using: 'gin',
+      //    operator: 'jsonb_path_ops'
+      //  },
+      //
+      //  // By default index name will be [table]_[fields]
+      //  // Creates a multi column partial index
+      //  {
+      //    name: 'public_by_author',
+      //    fields: ['author', 'status'],
+      //    where: {
+      //      status: 'public'
+      //    }
+      //  },
+      //
+      //  // A BTREE index with a ordered field
+      //  {
+      //    name: 'title_index',
+      //    method: 'BTREE',
+      //    fields: ['author', {attribute: 'title', collate: 'en_US', order: 'DESC', length: 5}]
+      //  }
+    ]
   });
 }

xggsve-merchant/app/base/service/impl/merchant/saasmerchantSve.js

@@ -250,7 +250,8 @@ class SaasMerchantService extends ServiceBase {
     }
     let merchant = await this.dao.findById(params.id);
     let sign = await this.saasmerchantsignDao.findById(params.id);
-    sign.main_id = Number(this.trim(params.main_id) || 0);
+    sign.main_id = this.trim(params.main_id);
+    sign.main_id_trade = this.trim(params.main_id_trade);
     sign.begin_date = this.trim(params.begin_date);
     sign.end_date = this.trim(params.end_date);
     sign.bm_reg_price = Number(params.bm_reg_price || 0);