gsb

esign-admin/app/base/controller/impl/merchant/merchantCtl.js

@@ -6,25 +6,44 @@ const uuidv4 = require('uuid/v4');
 const logCtl = system.getObject("web.common.oplogCtl");
 
 class MerchantUserCtl extends CtlBase {
-  constructor() {
-    super();
-    this.merchantSve = system.getObject("service.merchant.merchantSve");
-  }
-
-  /**
-   * 启用禁用
-   * @param {*} params
-   * @param {*} pobj2
-   * @param {*} req
-   */
-  async test(params, pobj2, req) {
-    try {
-      return system.getResultSuccess(params);
-    } catch (error) {
-      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    constructor() {
+        super();
+        this.merchantSve = system.getObject("service.merchant.merchantSve");
+    }
+
+
+    async merchantOfList(params, pobj2, req) {
+        try {
+            return await this.merchantSve.merchantOfList(params);
+        } catch (error) {
+            return system.getResult(null, `系统错误 错误信息 ${error}`);
+        }
+    }
+
+    async addModifyMerchants(params, pobj2, req) {
+        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;
\ No newline at end of file
+module.exports = MerchantUserCtl;

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');
 const logCtl = system.getObject("web.common.oplogCtl");
 
 class MerchantUserCtl extends CtlBase {
-  constructor() {
-    super();
-    this.userSve = system.getObject("service.uc.userSve");
-    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}`);
+    constructor() {
+        super();
+        this.merchantSve = system.getObject("service.merchant.merchantSve");
     }
-  }
 
-  async delUser(params, pobj2, req) {
-    try {
-      return await this.userSve.delUser(params);
-    } catch (error) {
-      return system.getResult(null, `系统错误 错误信息 ${error}`);
+
+    async merchanttradesOfList(params, pobj2, req) {
+        try {
+            return await this.merchantSve.merchanttradesOfList(params);
+        } 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}`);
+        }
     }
-  }
-
-  /**
-   * 根据pid查出子目录
-   * @param {*} params
-   */
-  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 auditMerchanttrade(params, pobj2, req) {
+        try {
+            return await this.merchantSve.auditMerchanttrade(params);
+        } catch (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;
\ No newline at end of file
+module.exports = MerchantUserCtl;

esign-admin/app/base/service/impl/merchant/merchantSve.js

@@ -2,17 +2,41 @@ const system = require("../../../system");
 const ServiceBase = require("../../svems.base")
 
 class UserService extends ServiceBase {
-  constructor() {
-    super();
-  }
+    constructor() {
+        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) {
-    try {
-      return await this.callms("sve_merchant", "xxxx", params);
-    } catch (error) {
-      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    async auditMerchant(params) {
+        try {
+            return await this.callms("sve_merchant", "auditMerchant", params);
+        } catch (error) {
+            return system.getResult(null, `系统错误 错误信息 ${error}`);
+        }
     }
-  }
 }
 
-module.exports = UserService;
\ No newline at end of file
+module.exports = UserService;

esign-admin/app/base/service/impl/merchant/merchanttradeSve.js

+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 {
 				// 用户服务
 				sve_uc: local + ":3651" + path,
 				// 商户服务
-				sve_merchant: dev + ":3652" + path,
+				sve_merchant: local + ":3652" + path,
 				// 订单服务
 				sve_order: dev + ":3653" + path,
 			}