Skip to content

Z
zhichan
Commit 80718a48 by zhaoxiqing
Options

gsb

parent 58b78bef
Showing with 149 additions and 72 deletions
esign-admin/app/base/controller/impl/merchant/merchantCtl.js
...@@ -6,25 +6,44 @@ const uuidv4 = require('uuid/v4'); ...@@ -6,25 +6,44 @@ const uuidv4 = require('uuid/v4');
const logCtl = system.getObject("web.common.oplogCtl"); const logCtl = system.getObject("web.common.oplogCtl");
class MerchantUserCtl extends CtlBase { class MerchantUserCtl extends CtlBase {
constructor() { constructor() {
super(); super();
this.merchantSve = system.getObject("service.merchant.merchantSve"); this.merchantSve = system.getObject("service.merchant.merchantSve");
} }
/**
* 启用禁用 async merchantOfList(params, pobj2, req) {
* @param {*} params try {
* @param {*} pobj2 return await this.merchantSve.merchantOfList(params);
* @param {*} req } catch (error) {
*/ return system.getResult(null, `系统错误 错误信息 ${error}`);
async test(params, pobj2, req) { }
try { }
return system.getResultSuccess(params);
} catch (error) { async addModifyMerchants(params, pobj2, req) {
return system.getResult(null, `系统错误 错误信息 ${error}`); try {
return await this.merchantSve.addModifyMerchants(params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async merchantSuggest(params, pobj2, req) {
try {
return await this.merchantSve.merchantSuggest(params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async auditMerchant(params, pobj2, req) {
try {
return await this.merchantSve.auditMerchant(params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
} }
}
} }
module.exports = MerchantUserCtl; module.exports = MerchantUserCtl;
\ No newline at end of file
esign-admin/app/base/controller/impl/merchant/merchantuserCtl.js → esign-admin/app/base/controller/impl/merchant/merchanttradeCtl.js
...@@ -6,50 +6,45 @@ const uuidv4 = require('uuid/v4'); ...@@ -6,50 +6,45 @@ const uuidv4 = require('uuid/v4');
const logCtl = system.getObject("web.common.oplogCtl"); const logCtl = system.getObject("web.common.oplogCtl");
class MerchantUserCtl extends CtlBase { class MerchantUserCtl extends CtlBase {
constructor() { constructor() {
super(); super();
this.userSve = system.getObject("service.uc.userSve"); this.merchantSve = system.getObject("service.merchant.merchantSve");
this.redisClient = system.getObject("util.redisClient");
}
/**
* 启用禁用
* @param {*} params
* @param {*} pobj2
* @param {*} req
*/
async enabled(params, pobj2, req) {
try {
params.id = Number(params.id || 0);
params.enabled = Number(params.enabled || 0);
return await this.userSve.enabled(params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
}
async delUser(params, pobj2, req) {
try { async merchanttradesOfList(params, pobj2, req) {
return await this.userSve.delUser(params); try {
} catch (error) { return await this.merchantSve.merchanttradesOfList(params);
return system.getResult(null, `系统错误 错误信息 ${error}`); } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async addMerchanttrades(params, pobj2, req) {
try {
return await this.merchantSve.addMerchanttrades(params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
} }
}
async auditMerchanttrade(params, pobj2, req) {
/** try {
* 根据pid查出子目录 return await this.merchantSve.auditMerchanttrade(params);
* @param {*} params } catch (error) {
*/ return system.getResult(null, `系统错误 错误信息 ${error}`);
async page(params, pobj2, req) { }
try {
params.uctypeId = params.deliver_id;
return await this.userSve.page(params);
} catch (error) {
console.log(error);
return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
}
async merchanttradesOfListAll(params, pobj2, req) {
try {
return await this.merchantSve.merchanttradesOfListAll(params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
} }
module.exports = MerchantUserCtl; module.exports = MerchantUserCtl;
\ No newline at end of file
esign-admin/app/base/service/impl/merchant/merchantSve.js
...@@ -2,17 +2,41 @@ const system = require("../../../system"); ...@@ -2,17 +2,41 @@ const system = require("../../../system");
const ServiceBase = require("../../svems.base") const ServiceBase = require("../../svems.base")
class UserService extends ServiceBase { class UserService extends ServiceBase {
constructor() { constructor() {
super(); super();
} }
async merchantOfList(params) {
try {
return await this.callms("sve_merchant", "merchantOfList", params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async addModifyMerchants(params) {
try {
return await this.callms("sve_merchant", "addModifyMerchants", params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async merchantSuggest(params) {
try {
return await this.callms("sve_merchant", "merchantSuggest", params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async info(params) { async auditMerchant(params) {
try { try {
return await this.callms("sve_merchant", "xxxx", params); return await this.callms("sve_merchant", "auditMerchant", params);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
}
} }
}
} }
module.exports = UserService; module.exports = UserService;
\ No newline at end of file
esign-admin/app/base/service/impl/merchant/merchanttradeSve.js 0 → 100644
const system = require("../../../system");
const ServiceBase = require("../../svems.base")
class UserService extends ServiceBase {
constructor() {
super();
}
async merchanttradesOfList(params) {
try {
return await this.callms("sve_merchant", "merchanttradesOfList", params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async addMerchanttrades(params) {
try {
return await this.callms("sve_merchant", "addMerchanttrades", params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async auditMerchanttrade(params) {
try {
return await this.callms("sve_merchant", "auditMerchanttrade", params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async merchanttradesOfListAll(params) {
try {
return await this.callms("sve_merchant", "merchanttradesOfListAll", params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
}
module.exports = UserService;
esign-admin/app/base/system.js
...@@ -198,7 +198,7 @@ class System { ...@@ -198,7 +198,7 @@ class System {
// 用户服务 // 用户服务
sve_uc: local + ":3651" + path, sve_uc: local + ":3651" + path,
// 商户服务 // 商户服务
sve_merchant: dev + ":3652" + path, sve_merchant: local + ":3652" + path,
// 订单服务 // 订单服务
sve_order: dev + ":3653" + path, sve_order: dev + ":3653" + path,
} }
......
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