|
@@ -54,7 +54,7 @@ class BillService extends CrudService {
|
|
|
const { shop, start, end } = query;
|
|
const { shop, start, end } = query;
|
|
|
const pipline = [];
|
|
const pipline = [];
|
|
|
// 商店过滤&时间过滤
|
|
// 商店过滤&时间过滤
|
|
|
- const q = { $match: { $and: [{ apply_time: { $gte: start } }, { apply_time: { $lte: end } }] } }; // 退款,退货的完成状态, status:{$in:['-1','-2']}, out_bill:{$ne:'0'}
|
|
|
|
|
|
|
+ const q = { $match: { $and: [{ apply_time: { $gte: start } }, { apply_time: { $lte: end } }], status: { $in: [ '-1', '-2' ] } } }; // 退款,退货的完成状态, status:{$in:['-1','-2']}, out_bill:{$ne:'0'}
|
|
|
if (shop) q.$match.shop = shop;
|
|
if (shop) q.$match.shop = shop;
|
|
|
pipline.push(q);
|
|
pipline.push(q);
|
|
|
// 组织数据
|
|
// 组织数据
|
