Commit 73feaf38 by 王昆

gsb

parent 20423f4e
...@@ -98,7 +98,7 @@ class MerchantService extends ServiceBase { ...@@ -98,7 +98,7 @@ class MerchantService extends ServiceBase {
} }
this.addWhereTime(where, 'created_at', params.beginTime, params.entTime, true); this.addWhereTime(where, 'created_at', params.beginTime, params.entTime, true);
var orderby = [["id", 'desc']]; var orderby = [["id", 'desc']];
var attributes = [`id`, `name`, `credit_code`, `contact_man`, `contact_mobile`, `contact_email`, `account_name`, `audit_status`]; var attributes = [`id`, `name`, `credit_code`, `contact_man`, `contact_mobile`, `contact_email`, `account_name`, `audit_status`, `bd_id`];
var page = await this.getPageList(currentPage, pageSize, where, orderby, attributes); var page = await this.getPageList(currentPage, pageSize, where, orderby, attributes);
return system.getResultSuccess(page); return system.getResultSuccess(page);
} catch (e) { } catch (e) {
...@@ -112,7 +112,7 @@ class MerchantService extends ServiceBase { ...@@ -112,7 +112,7 @@ class MerchantService extends ServiceBase {
if (!params.id) { if (!params.id) {
return system.getResultFail(-1, "商户ID为空"); return system.getResultFail(-1, "商户ID为空");
} }
var merchant = await this.dao.findById(params.id) || {}; var merchant = await this.dao.getById(params.id) || {};
return system.getResultSuccess(merchant); return system.getResultSuccess(merchant);
} catch (e) { } catch (e) {
console.log(e); console.log(e);
......
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