@@ -118,14 +118,14 @@ export class AgentOrderService extends BaseService {
}
})
if (!agent) {
- return []
+ return null;
const agentMchs = await this.agentMerchantEntity.findBy({ agentId: agent.id + '' })
const mchIds = agentMchs.map(item => {
return "'" + item.mchId + "'";
if (!mchIds || mchIds.length === 0) {
- return [];
const sql = `SELECT a.id, a.orderNo, a.outOrderNo, a.mchId, a.payType, a.amount, a.charge, a.status, a.currency, a.remark, a.createTime FROM dj_order a WHERE 1=1
and a.mchId in (${mchIds.join(',')})