Skip to content

Z
zhichan
Commit a41ada32 by DESKTOP-7Q3CA17\86137
Options

gsb

parent d95a7899
Showing with 69 additions and 67 deletions
bpo-stat/app/base/controller/impl/all/merchantTransferCtl.js
...@@ -2,13 +2,12 @@ var system = require("../../../system") ...@@ -2,13 +2,12 @@ var system = require("../../../system")
const CtlBase = require("../../ctl.base"); const CtlBase = require("../../ctl.base");
//商户信息
class MerchantTransferCtl extends CtlBase { class MerchantTransferCtl extends CtlBase {
constructor() { constructor() {
super("all", CtlBase.getServiceName(MerchantTransferCtl)); super("all", CtlBase.getServiceName(MerchantTransferCtl));
} }
//商户列表 //商户转账
async transferList(qobj) { async transferList(qobj) {
var params = qobj || {}; var params = qobj || {};
this.doTimeCondition(params, ["signBegin", "signEnd"]); this.doTimeCondition(params, ["signBegin", "signEnd"]);
...@@ -20,14 +19,9 @@ class MerchantTransferCtl extends CtlBase { ...@@ -20,14 +19,9 @@ class MerchantTransferCtl extends CtlBase {
return system.getErrResult2("您的网络不稳, 请稍后重试"); return system.getErrResult2("您的网络不稳, 请稍后重试");
} }
} }
async test(){
var page = await this.service.test();
return system.getResult2(page);
}
} }
module.exports = MerchantTransferCtl; module.exports = MerchantTransferCtl;
\ No newline at end of file
bpo-stat/app/base/db/models/all/merchanttransfer.js
/* jshint indent: 2 */ /* jshint indent: 2 */
module.exports = function (sequelize, DataTypes) { module.exports = function (sequelize, DataTypes) {
return sequelize.define('merchanttransfer', { return sequelize.define('merchanttransfer', {
merchant_name: DataTypes.STRING, merchant_name: DataTypes.STRING,
amt: DataTypes.STRING, amt: DataTypes.STRING,
transfer_at: DataTypes.DATE, transfer_at: DataTypes.DATE,
}, { sign_body_id : DataTypes.INTEGER,
tableName: 'merchant_transfer', sign_body : DataTypes.STRING,
paranoid: true,//假的删除 receipt_url: DataTypes.STRING,
underscored: true, }, {
version: false, tableName: 'merchant_transfer',
freezeTableName: true, paranoid: true,//假的删除
//freezeTableName: true, underscored: true,
// define the table's name version: false,
validate: {}, freezeTableName: true,
indexes: [ //freezeTableName: true,
// Create a unique index on email // define the table's name
// { validate: {},
// unique: true, indexes: [
// fields: ['email'] // Create a unique index on email
// }, // {
// // unique: true,
// // Creates a gin index on data with the jsonb_path_ops operator // fields: ['email']
// { // },
// fields: ['data'], //
// using: 'gin', // // Creates a gin index on data with the jsonb_path_ops operator
// operator: 'jsonb_path_ops' // {
// }, // fields: ['data'],
// // using: 'gin',
// // By default index name will be [table]_[fields] // operator: 'jsonb_path_ops'
// // Creates a multi column partial index // },
// { //
// name: 'public_by_author', // // By default index name will be [table]_[fields]
// fields: ['author', 'status'], // // Creates a multi column partial index
// where: { // {
// status: 'public' // name: 'public_by_author',
// } // fields: ['author', 'status'],
// }, // where: {
// // status: 'public'
// // A BTREE index with a ordered field // }
// { // },
// name: 'title_index', //
// method: 'BTREE', // // A BTREE index with a ordered field
// fields: ['author', {attribute: 'title', collate: 'en_US', order: 'DESC', length: 5}] // {
// } // name: 'title_index',
] // method: 'BTREE',
}); // fields: ['author', {attribute: 'title', collate: 'en_US', order: 'DESC', length: 5}]
// }
]
});
}; };
bpo-stat/app/base/db/models/all/recruit.js
...@@ -12,6 +12,7 @@ module.exports = function (sequelize, DataTypes) { ...@@ -12,6 +12,7 @@ module.exports = function (sequelize, DataTypes) {
work_address: DataTypes.STRING, work_address: DataTypes.STRING,
sign_body_id: DataTypes.INTEGER, sign_body_id: DataTypes.INTEGER,
sign_body: DataTypes.STRING, sign_body: DataTypes.STRING,
status : DataTypes.INTEGER,
redundance_1: DataTypes.STRING, redundance_1: DataTypes.STRING,
redundance_2: DataTypes.STRING, redundance_2: DataTypes.STRING,
redundance_3: DataTypes.STRING, redundance_3: DataTypes.STRING,
......
bpo-stat/app/base/service/impl/all/merchantTransferSve.js
...@@ -2,9 +2,7 @@ const system = require("../../../system"); ...@@ -2,9 +2,7 @@ const system = require("../../../system");
const ServiceBase = require("../../sve.base"); const ServiceBase = require("../../sve.base");
const settings = require("../../../../config/settings"); const settings = require("../../../../config/settings");
/**
* 发票列表
*/
class MerchantTransferService extends ServiceBase { class MerchantTransferService extends ServiceBase {
constructor() { constructor() {
super("all", ServiceBase.getDaoName(MerchantTransferService)); super("all", ServiceBase.getDaoName(MerchantTransferService));
...@@ -21,6 +19,11 @@ class MerchantTransferService extends ServiceBase { ...@@ -21,6 +19,11 @@ class MerchantTransferService extends ServiceBase {
[this.db.Op.like]: "%" + params.merchant_name + "%" [this.db.Op.like]: "%" + params.merchant_name + "%"
}; };
} }
if (params.merchant_name) {
where.merchant_name = {
[this.db.Op.like]: "%" + params.merchant_name + "%"
};
}
this.addWhereTime(where, 'transfer_at', params.signBegin, params.signEnd, true); this.addWhereTime(where, 'transfer_at', params.signBegin, params.signEnd, true);
...@@ -38,4 +41,4 @@ class MerchantTransferService extends ServiceBase { ...@@ -38,4 +41,4 @@ class MerchantTransferService extends ServiceBase {
} }
} }
module.exports = MerchantTransferService; module.exports = MerchantTransferService;
\ No newline at end of file
bpo-stat/app/base/service/impl/all/recruitSve.js
...@@ -20,6 +20,9 @@ class RecruitService extends ServiceBase { ...@@ -20,6 +20,9 @@ class RecruitService extends ServiceBase {
if(params.sign_body_id){ if(params.sign_body_id){
where.sign_body_id = params.sign_body_id; where.sign_body_id = params.sign_body_id;
} }
if(params.status){
where.status = params.status;
}
this.addWhereTime(where, 'publish_date', params.signBegin, params.signEnd, true); this.addWhereTime(where, 'publish_date', params.signBegin, params.signEnd, true);
var orderby = [ var orderby = [
["id", 'desc'] ["id", 'desc']
......
bpo-stat/app/config/localsettings.js
...@@ -6,19 +6,19 @@ var settings = { ...@@ -6,19 +6,19 @@ var settings = {
db: 10, db: 10,
}, },
database: { database: {
dbname: "bpo_stat", dbname: "stat",
user: "write", user: "root",
password: "write", password: "!@#Qaz741",
config: { config: {
//host: 'rm-2ze5muw8tb37i3ig4lo.mysql.rds.aliyuncs.com', host: 'rm-2ze5muw8tb37i3ig4lo.mysql.rds.aliyuncs.com',
// dbname : "bpo_stat", // dbname : "bpo_stat",
// user: "write", // user: "write",
// password: "write", // password: "write",
// config: { // config: {
// host: '192.168.18.237', // host: '192.168.18.237',
//port: 3306, port: 3306,
host: '43.247.184.35', // host: '43.247.184.35',
port: 8899, // port: 8899,
dialect: 'mysql', dialect: 'mysql',
operatorsAliases: false, operatorsAliases: false,
pool: { pool: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment