gsb

xggsve-order/app/base/db/models/order/obusinessmen.js

@@ -49,6 +49,8 @@ module.exports = function (db, DataTypes) {
     sign_notes: {type: DataTypes.STRING, field: 'sign_notes', allowNull: true, defaultValue:'', comment:'签约备注' },
     sign_time: {type: DataTypes.DATE, field: 'sign_time', allowNull: true, defaultValue:null, comment:'签约时间' },
     is_create_account: {type: DataTypes.BOOLEAN, field: 'is_create_account', allowNull: true, defaultValue:false, comment:'是否建帐' },
+    bd_id: {type: DataTypes.INTEGER, field: 'bd_id', allowNull: true, defaultValue:'', comment:'业务员id' },
+    bd_path: {type: DataTypes.STRING, field: 'bd_path', allowNull: true, defaultValue:'', comment:'业务员权限路径' },
     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 }

xggsve-order/app/base/db/models/order/oorder.js

@@ -15,8 +15,8 @@ module.exports = function (db, DataTypes) {
     assign_user_id: {type: DataTypes.BIGINT, field: 'assign_user_id', allowNull: true, defaultValue:'0', comment:'分配人id' },
     deliver_id: {type: DataTypes.STRING, field: 'deliver_id', allowNull: true, defaultValue:'', comment:'交付商id common微服务下' },
     desc: {type: DataTypes.STRING, field: 'desc', allowNull: true, defaultValue:'', comment:'订单信息' },
-    bd_id: {type: DataTypes.STRING, field: 'bd_id', allowNull: true, defaultValue:'', comment:'业务员id' },
-    bd_path: {type: DataTypes.BIGINT, field: 'bd_path', allowNull: true, defaultValue:'', comment:'业务员权限路径' },
+    bd_id: {type: DataTypes.INTEGER, field: 'bd_id', allowNull: true, defaultValue:'', comment:'业务员id' },
+    bd_path: {type: DataTypes.STRING, field: 'bd_path', allowNull: true, defaultValue:'', comment:'业务员权限路径' },
     service_items: {type: DataTypes.STRING, field: 'service_items', allowNull: true, defaultValue:'', comment:'服务项json' },
     service_remark: {type: DataTypes.STRING, field: 'service_remark', allowNull: true, defaultValue:'', comment:'服务信息备注' },
     source_id: {type: DataTypes.BIGINT, field: 'source_id', allowNull: true, defaultValue:0, comment:'来源id' },

xggsve-order/app/base/service/impl/order/obusinessmenSve.js

@@ -23,6 +23,54 @@ class ObusinessmenService extends ServiceBase {
     }
   }
 
+  async businessmenPage(params) {
+    let currentPage = Number(params.currentPage || 1);
+    let pageSize = Number(params.pageSize || 10);
+
+    let bd_id = this.trim(params.bd_id);
+    let bd_path = this.trim(params.bd_path);
+    let bdPath = this.trim(params.bdPath);
+    let ostatuses = params.ostatuses;
+
+    var where = {};
+
+    var orderby = [
+      ["id", 'desc']
+    ];
+
+    if (bdId) {
+      where.merchant_id = bdId;
+    }
+    if (bdPath && bdPath.length > 0) {
+      where.id = {
+        [this.db.Op.like]: bdPath + "%"
+      }
+    }
+    if (userId) {
+      where.userId = userId;
+    }
+    if (ostatuses && ostatuses.length > 0) {
+      where.ostatus = {
+        [this.db.Op.in]: ostatuses
+      }
+    }
+
+    this.addWhereTime(where, 'created_at', params.createdBegin, params.createdEnd);
+
+    var page = await this.getPageList(currentPage, pageSize, where, orderby, null);
+    if (page && page.rows) {
+      for (var row of page.rows) {
+        await this.dao.setRowCodeName(row, "status");
+        await this.dao.setRowCodeName(row, "ostatus");
+        await this.dao.setRowCodeName(row, "deliverType");
+
+        this.handleDate(row, ["created_at", "assignTime"], null, -8);
+      }
+    }
+    return system.getResultSuccess(page);
+
+
+  }
 }
 
 module.exports = ObusinessmenService;
\ No newline at end of file