d

xgg-saas-platform/app/base/controller/impl/saas/channelCtl.js

@@ -22,6 +22,31 @@ class ChannelCtl extends CtlBase {
     }
     }
   }
   }
 
 
+  /**
+   * fn:获取渠道交付信息
+   * @param params
+   * @param pobj2
+   * @param req
+   * @returns {Promise<{msg: string, data: (*|null), bizmsg: string, status: number}|*>}
+   */
+  async delvierInfo(params, pobj2, req) {
+    try {
+      if(!params.channel_id){
+        system.getResult(null, `登录失效，请重新登录`);
+      }
+      let user = req.loginUser;
+      let rs = {
+        contact_man:user.contact_man,
+        contact_mobile : user.contact_mobile,
+        contact_email : user.contact_email,
+        contact_addr : user.contact_addr,
+      };
+      return system.getResult(rs);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
   async page(params, pobj2, req) {
   async page(params, pobj2, req) {
     try {
     try {
       return await this.channelSve.page(params);
       return await this.channelSve.page(params);

xgg-saas-platform/app/base/controller/impl/saas/orderCtl.js

@@ -58,6 +58,8 @@ class ChannelCtl extends CtlBase {
     }
     }
   }
   }
 
 
+
+
   /**
   /**
    * fn：查询产品
    * fn：查询产品
    * @param pobj
    * @param pobj
@@ -68,7 +70,8 @@ class ChannelCtl extends CtlBase {
   async orderChooseProducts(pobj, pobj2, req) {
   async orderChooseProducts(pobj, pobj2, req) {
     //TODO: 绑定渠道商品信息
     //TODO: 绑定渠道商品信息
     try {
     try {
-      return system.getResult([{"id":"10020300","name":"刻章办理"},{"id":"10020400","name":"银行开户"},{"id":"10020500","name":"税务报道"},{"id":"10020600","name":"代理记账"}]);
+      // return system.getResult([{"id":"10020300","name":"刻章办理"},{"id":"10020400","name":"银行开户"},{"id":"10020500","name":"税务报道"},{"id":"10020600","name":"代理记账"}]);
+      return system.getResult([{"id":"10020300","name":"刻章办理"},{"id":"10020400","name":"银行开户"},{"id":"10020500","name":"税务报道"}]);
     } catch (e) {
     } catch (e) {
       console.log(e);
       console.log(e);
       return system.getResultFail(500, "接口错误");
       return system.getResultFail(500, "接口错误");

xgg-saas-platform/app/base/controller/impl/uc/userCtl.js

@@ -12,6 +12,8 @@ class UserCtl extends CtlBase {
     this.redisClient = system.getObject("util.redisClient");
     this.redisClient = system.getObject("util.redisClient");
     this.captchaSve = system.getObject("service.common.captchaSve");
     this.captchaSve = system.getObject("service.common.captchaSve");
     this.deliverSve = system.getObject("service.common.deliverSve");
     this.deliverSve = system.getObject("service.common.deliverSve");
+    this.channelSve = system.getObject("service.saas.channelSve");
+
   }
   }
 
 
   async login(pobj, pobj2, req, res) {
   async login(pobj, pobj2, req, res) {
@@ -27,6 +29,18 @@ class UserCtl extends CtlBase {
       }
       }
 
 
       loginUser = loginUser.data;
       loginUser = loginUser.data;
+
+
+      let channel = await this.channelSve.info({id:loginUser.channel_id});
+      if (channel.status != 0) {
+        return system.getResult(null, `渠道【${loginName}】不存在`);
+      }
+      channel = channel.data;
+      loginUser.contact_man = channel.contact_man;
+      loginUser.contact_mobile = channel.contact_mobile;
+      loginUser.contact_email = channel.contact_email;
+      loginUser.contact_addr = channel.contact_addr;
+
       var loginsid = await this.setLogin(loginUser);
       var loginsid = await this.setLogin(loginUser);
       let rs = {
       let rs = {
         key: loginsid,
         key: loginsid,

xgg-saas-platform/app/base/system.js

@@ -191,10 +191,10 @@ class System {
       let dev = "http://39.107.234.14";
       let dev = "http://39.107.234.14";
       return {
       return {
         // 公共服务
         // 公共服务
-        common: dev + ":3102" + path,
+        common: local + ":3102" + path,
 
 
         // 商户服务
         // 商户服务
-        merchant: dev + ":3101" + path,
+        merchant: local + ":3101" + path,
 
 
         // 订单服务
         // 订单服务
         order: local + ":3103" + path,
         order: local + ":3103" + path,
@@ -203,7 +203,7 @@ class System {
         invoice: dev + ":3105" + path,
         invoice: dev + ":3105" + path,
 
 
         // 用户服务
         // 用户服务
-        uc: dev + ":3106" + path,
+        uc: local + ":3106" + path,
 
 
         // 交易
         // 交易
         trade: dev + ":3107" + path,
         trade: dev + ":3107" + path,

xgg-saas-platform/app/config/localsettings.js

@@ -5,6 +5,12 @@ var settings={
     password: "Gongsibao2018",
     password: "Gongsibao2018",
     db:10,
     db:10,
   },
   },
+    // redis:{
+    //     host: "127.0.0.1",
+    //     port: 6379,
+    //     password: "",
+    //     db:10,
+    // },
   database:{
   database:{
     dbname : "xgg",
     dbname : "xgg",
     user: "write",
     user: "write",