|
@@ -129,15 +129,17 @@ module.exports = app => {
|
|
|
*/
|
|
|
async getStageLastestPays(sid) {
|
|
|
const sql = 'SELECT SP.*, P.`order`, P.uid, P.name, P.minus, P.ptype, P.sprice, P.sexpr, P.rprice, P.rexpr, P.is_yf, P.dl_type, P.dl_count, P.dl_tp_type, P.dl_tp ' +
|
|
|
- ' FROM ?? As SP, ?? As P, ( ' +
|
|
|
- ' SELECT MAX(`times` * ' + timesLen + ' + `order`) As `sprogress` ' +
|
|
|
- ' FROM ?? ' +
|
|
|
+ ' FROM ' + this.tableName + ' As SP' +
|
|
|
+ ' INNER JOIN ' + this.ctx.service.pay.tableName + ' As P ON SP.pid = P.id' +
|
|
|
+ ' INNER JOIN ( ' +
|
|
|
+ ' SELECT MAX(`stimes` * ' + timesLen + ' + `sorder`) As `sprogress` ' +
|
|
|
+ ' FROM ' + this.tableName +
|
|
|
' WHERE `sid` = ? ' +
|
|
|
- ' GROUP BY `sid`) As M' +
|
|
|
- ' WHERE SP.`sid` = ? AND (SP.`stimes` * ' + timesLen + ' + `order`) = M.`sprogress` AND SP.`pid` = P.`id` AND P.`valid` = true' +
|
|
|
+ ' GROUP BY `sid`) As M ON (SP.`stimes` * ' + timesLen + ' + SP.`sorder`) = M.`sprogress`' +
|
|
|
+ ' WHERE SP.`sid` = ? AND P.`valid` = true' +
|
|
|
' ORDER BY P.`order`';
|
|
|
- const sqlParam = [this.tableName, this.ctx.service.pay.tableName, this.ctx.service.stageAudit.tableName,
|
|
|
- sid, sid];
|
|
|
+ const sqlParam = [sid, sid];
|
|
|
+ console.log(this.db.format(sql, sqlParam));
|
|
|
return await this.db.query(sql, sqlParam);
|
|
|
}
|
|
|
|