gsb

xggsve-invoice/app/base/db/impl/invoice/iinvoiceinforegDao.js

@@ -4,7 +4,6 @@ const Dao = require("../../dao.base");
 class IInvoiceinforegDao extends Dao {
 class IInvoiceinforegDao extends Dao {
   constructor() {
   constructor() {
     super(Dao.getModelName(IInvoiceinforegDao));
     super(Dao.getModelName(IInvoiceinforegDao));
-    this.tableName = this.model.tableName;
   }
   }
 }
 }
 
 

xggsve-invoice/app/base/db/impl/invoice/iinvoiceprocessDao.js

@@ -4,14 +4,13 @@ const Dao = require("../../dao.base");
 class IInvoiceprocessDao extends Dao {
 class IInvoiceprocessDao extends Dao {
   constructor() {
   constructor() {
     super(Dao.getModelName(IInvoiceprocessDao));
     super(Dao.getModelName(IInvoiceprocessDao));
-    this.tableName = this.model.tableName;
   }
   }
 
 
   async delByInvoiceId(invoice_id) {
   async delByInvoiceId(invoice_id) {
     if (!invoice_id) {
     if (!invoice_id) {
       return;
       return;
     }
     }
-    let sql = `DELETE FROM ${this.tableName} WHERE invoice_id = :invoice_id`;
+    let sql = `DELETE FROM ${this.model.tableName} WHERE invoice_id = :invoice_id`;
     await this.customUpdate(sql, {invoice_id: invoice_id});
     await this.customUpdate(sql, {invoice_id: invoice_id});
   }
   }
 
 
@@ -23,7 +22,7 @@ class IInvoiceprocessDao extends Dao {
     sql.push("SELECT");
     sql.push("SELECT");
     sql.push("*");
     sql.push("*");
     sql.push("FROM");
     sql.push("FROM");
-    sql.push(this.tableName);
+    sql.push(this.model.tableName);
     sql.push("WHERE invoice_id = :invoiceId");
     sql.push("WHERE invoice_id = :invoiceId");
     sql.push("AND `status` = :status");
     sql.push("AND `status` = :status");
 
 
@@ -43,7 +42,7 @@ class IInvoiceprocessDao extends Dao {
     sql.push("SELECT");
     sql.push("SELECT");
     sql.push("*");
     sql.push("*");
     sql.push("FROM");
     sql.push("FROM");
-    sql.push(this.tableName);
+    sql.push(this.model.tableName);
     sql.push("WHERE invoice_id IN (:invoiceIds)");
     sql.push("WHERE invoice_id IN (:invoiceIds)");
     sql.push("AND `status` IN (:statuses)");
     sql.push("AND `status` IN (:statuses)");
 
 

xggsve-invoice/app/base/db/models/invoice/iinvoice.js

@@ -49,16 +49,9 @@ module.exports = (db, DataTypes) => {
     bd_path:{ type: DataTypes.STRING(200), allowNull: true, defaultValue: null ,comment:"业务员权限"},
     bd_path:{ type: DataTypes.STRING(200), allowNull: true, defaultValue: null ,comment:"业务员权限"},
     channel_id:{ type: DataTypes.STRING(32), allowNull: true ,delaultValue:'',comment:"渠道ID"},
     channel_id:{ type: DataTypes.STRING(32), allowNull: true ,delaultValue:'',comment:"渠道ID"},
     product_id:{ type: DataTypes.STRING(32), allowNull: true ,delaultValue:'',comment:"商品ID"},
     product_id:{ type: DataTypes.STRING(32), allowNull: true ,delaultValue:'',comment:"商品ID"},
-<<<<<<< HEAD
-    created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false, defaultValue: DataTypes.NOW },
-    updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false, defaultValue: DataTypes.NOW },
-    deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true },
-    version: { type: DataTypes.INTEGER, allowNull: true, defaultValue: 0 }
-=======
     created_at: { type: DataTypes.DATE, allowNull: true },
     created_at: { type: DataTypes.DATE, allowNull: true },
     updated_at: { type: DataTypes.DATE, allowNull: true },
     updated_at: { type: DataTypes.DATE, allowNull: true },
     deleted_at: { type: DataTypes.DATE, allowNull: true },
     deleted_at: { type: DataTypes.DATE, allowNull: true },
->>>>>>> 04a0b5e93a1f0074627779a207d7a1380983e60f
   }, {
   }, {
     timestamps: false,
     timestamps: false,
     paranoid: true,
     paranoid: true,