Commit 2255a40d by 王昆

gsb

parent 206882e0
...@@ -912,8 +912,8 @@ class EsettleService extends ServiceBase { ...@@ -912,8 +912,8 @@ class EsettleService extends ServiceBase {
sql.push("id, deduct_amt "); sql.push("id, deduct_amt ");
sql.push("FROM `tbl_order` "); sql.push("FROM `tbl_order` ");
sql.push("WHERE busi_id = :busiId"); sql.push("WHERE busi_id = :busiId");
sql.push("AND pay_complete_time >= :begin"); sql.push("AND create_time >= :begin");
sql.push("AND pay_complete_time <= :end"); sql.push("AND create_time <= :end");
var list = await this.settledb.query(sql.join(" "), { replacements: { busiId: busiId, begin: begin, end: end } }); var list = await this.settledb.query(sql.join(" "), { replacements: { busiId: busiId, begin: begin, end: end } });
if (list && list.length > 0) { if (list && list.length > 0) {
......
...@@ -357,8 +357,8 @@ class EsettleofflineService extends ServiceBase { ...@@ -357,8 +357,8 @@ class EsettleofflineService extends ServiceBase {
sql.push("id, amt as deduct_amt"); sql.push("id, amt as deduct_amt");
sql.push("FROM `c_esettle_offline` "); sql.push("FROM `c_esettle_offline` ");
sql.push("WHERE ecompany_id = :companyId"); sql.push("WHERE ecompany_id = :companyId");
sql.push("AND pay_time >= :begin"); sql.push("AND created_at >= :begin");
sql.push("AND pay_time <= :end"); sql.push("AND created_at <= :end");
return await this.dao.customQuery(sql.join(" "), { companyId: companyId, begin: begin, end: end }) || []; return await this.dao.customQuery(sql.join(" "), { companyId: companyId, begin: begin, end: end }) || [];
} }
......
...@@ -3,7 +3,7 @@ var settings = { ...@@ -3,7 +3,7 @@ var settings = {
host: "43.247.184.32", host: "43.247.184.32",
port: 8967, port: 8967,
password: "Gongsibao2018", password: "Gongsibao2018",
db: 12, db: 11,
}, },
database: { database: {
// dbname : "bpo", // dbname : "bpo",
......
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