|
@@ -16,17 +16,20 @@ class TransactionService extends CrudService {
|
|
query = this.ctx.service.util.util.dealQuery(query);
|
|
query = this.ctx.service.util.util.dealQuery(query);
|
|
const { user_id, supplier, demander, status, ...info } = query;
|
|
const { user_id, supplier, demander, status, ...info } = query;
|
|
if (status)query.status = status.split(',');
|
|
if (status)query.status = status.split(',');
|
|
- let res;
|
|
|
|
|
|
+ let data;
|
|
|
|
+ let total;
|
|
if (!user_id) {
|
|
if (!user_id) {
|
|
- res = await this.model.find(query).skip(parseInt(skip)).limit(parseInt(limit))
|
|
|
|
|
|
+ data = await this.model.find(query).skip(parseInt(skip)).limit(parseInt(limit))
|
|
.sort({ 'meta.createdAt': -1 });
|
|
.sort({ 'meta.createdAt': -1 });
|
|
|
|
+ total = await this.model.count(query);
|
|
} else {
|
|
} else {
|
|
const nquery = { ...info, $or: [{ supplier: user_id }, { demander: user_id }] };
|
|
const nquery = { ...info, $or: [{ supplier: user_id }, { demander: user_id }] };
|
|
if (query.status) nquery.status = query.status;
|
|
if (query.status) nquery.status = query.status;
|
|
- res = await this.model.find(nquery).skip(parseInt(skip)).limit(parseInt(limit))
|
|
|
|
|
|
+ data = await this.model.find(nquery).skip(parseInt(skip)).limit(parseInt(limit))
|
|
.sort({ 'meta.createdAt': -1 });
|
|
.sort({ 'meta.createdAt': -1 });
|
|
|
|
+ total = await this.model.count(nquery);
|
|
}
|
|
}
|
|
- return res;
|
|
|
|
|
|
+ return { data, total };
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|