Merge branch 'xgg-saas-platform' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-saas-platform

xgg-saas-platform/app/base/controller/impl/common/deliverCtl.js

@@ -38,81 +38,129 @@ class DeliverCtl extends CtlBase {
     }
   }
 
-  async save(pobj, pobj2, req) {
+  async enabled(pobj, pobj2, req) {
+    pobj.isEnabled = Number(pobj.isEnabled || 0);
     try {
-      return await this.deliverSve.save(pobj);
+      return await this.deliverSve.enabled(pobj);
     } catch (e) {
       console.log(e);
       return system.getResultFail(500, "接口错误");
     }
   }
 
-  async del(pobj, pobj2, req) {
-    try {
-      return await this.deliverSve.del(pobj);
-    } catch (e) {
-      console.log(e);
-      return system.getResultFail(500, "接口错误");
+  async resetPassword(pobj, pobj2, req) {
+
+    let params = {
+      admin_id: this.trim(pobj.admin_id),
+      password: this.trim(pobj.password),
     }
+    if(!params.password) {
+      return system.getResult(null, "请输入密码");
     }
 
-  async deliverUserPage(pobj, pobj2, req) {
     try {
-      return await this.deliverSve.deliverUserPage(pobj);
+      return await this.deliverSve.resetPassword(pobj);
     } catch (e) {
       console.log(e);
       return system.getResultFail(500, "接口错误");
     }
   }
-  async deliverUserById(pobj, pobj2, req) {
+
+  async save(pobj, pobj2, req) {
     try {
-      return await this.deliverSve.deliverUserById(pobj);
-    } catch (e) {
-      console.log(e);
-      return system.getResultFail(500, "接口错误");
+      let id = this.trim(pobj.id);
+      let name = this.trim(pobj.name);
+      let real_name = this.trim(pobj.real_name);
+      let ucname = this.trim(pobj.ucname);
+      let password = this.trim(pobj.password);
+      let isEnabled = pobj.isEnabled || 0;
+
+      if (!name) {
+        return system.getResult(null, "请输入交付商名称");
       }
+      if (!real_name) {
+        return system.getResult(null, "请输入管理员名称");
       }
-  async deliverUserSave(pobj, pobj2, req) {
-    try {
-      return await this.deliverSve.deliverUserSave(pobj);
-    } catch (e) {
-      console.log(e);
-      return system.getResultFail(500, "接口错误");
+      if(!ucname) {
+        return system.getResult(null, "请填写用户名");
       }
+
+      if(!(/^1\d{10}$/.test(ucname))) {
+        return system.getResult(null, "帐号名必须为手机号");
       }
 
-  async allOrg(pobj, pobj2, req) {
-    try {
-      return await this.deliverSve.allOrg(pobj);
-    } catch (e) {
-      console.log(e);
-      return system.getResultFail(500, "接口错误");
+      if (!id) {
+        if (!password) {
+          return system.getResult(null, "请输入密码");
         }
       }
-  async orgTree(pobj, pobj2, req) {
-    try {
-      return await this.deliverSve.orgTree(pobj);
+      let params = {
+        id: id,
+        name: name,
+        real_name: real_name,
+        ucname: ucname,
+        password: password,
+        isEnabled: isEnabled,
+        saas_id: pobj.saas_id,
+      }
+      return await this.deliverSve.save(params);
     } catch (e) {
       console.log(e);
       return system.getResultFail(500, "接口错误");
     }
   }
-  async orgById(pobj, pobj2, req) {
+
+  async del(pobj, pobj2, req) {
     try {
-      return await this.deliverSve.orgById(pobj);
+      return await this.deliverSve.del(pobj);
     } catch (e) {
       console.log(e);
       return system.getResultFail(500, "接口错误");
     }
   }
-  async orgSave(pobj, pobj2, req) {
+
+  async provinceList(pobj, pobj2, req) {
     try {
-      return await this.deliverSve.orgSave(pobj);
+      return system.getResultSuccess([
+        {"id": 1100, "name":"北京市"},
+        {"id": 1200, "name":"天津市"},
+        {"id": 1300, "name":"河北省"},
+        {"id": 1400, "name":"山西省"},
+        {"id": 1500, "name":"内蒙古自治区"},
+        {"id": 2100, "name":"辽宁省"},
+        {"id": 2200, "name":"吉林省"},
+        {"id": 2300, "name":"黑龙江省"},
+        {"id": 3100, "name":"上海市"},
+        {"id": 3200, "name":"江苏省"},
+        {"id": 3300, "name":"浙江省"},
+        {"id": 3400, "name":"安徽省"},
+        {"id": 3500, "name":"福建省"},
+        {"id": 3600, "name":"江西省"},
+        {"id": 3700, "name":"山东省"},
+        {"id": 4100, "name":"河南省"},
+        {"id": 4200, "name":"湖北省"},
+        {"id": 4300, "name":"湖南省"},
+        {"id": 4400, "name":"广东省"},
+        {"id": 4500, "name":"广西壮族自治区"},
+        {"id": 5000, "name":"重庆市"},
+        {"id": 5100, "name":"四川省"},
+        {"id": 5200, "name":"贵州省"},
+        {"id": 5300, "name":"云南省"},
+        {"id": 5400, "name":"西藏自治区"},
+        {"id": 6100, "name":"陕西省"},
+        {"id": 6200, "name":"甘肃省"},
+        {"id": 6300, "name":"青海省"},
+        {"id": 6400, "name":"宁夏回族自治区"},
+        {"id": 6500, "name":"新疆维吾尔自治区"},
+        {"id": 7100, "name":"台湾省"},
+        {"id": 8100, "name":"香港特别行政区"},
+        {"id": 8200, "name":"澳门特别行政区"},
+      ]);
     } catch (e) {
       console.log(e);
       return system.getResultFail(500, "接口错误");
     }
   }
-
 }
+
 module.exports = DeliverCtl;
\ No newline at end of file

xgg-saas-platform/app/base/service/impl/common/deliverSve.js

 const system = require("../../../system");
 const ServiceBase = require("../../svems.base");
 var settings = require("../../../../config/settings");
+const axios = require("axios");
 
 class DeliverService extends ServiceBase {
   constructor() {
     super();
-  }
-
-  async login(params) {
-    var rs = await this.callms("common", "deliverLogin", params);
-    return rs;
+    this.synlogDao = system.getObject("db.log.synlogDao");
   }
 
   async all(params) {
@@ -30,52 +27,89 @@ class DeliverService extends ServiceBase {
     return rs;
   }
 
-  async mayByIds(ids) {
-    var rs = await this.callms("common", "deliverUserMap", {ids: ids});
-    await this.doPercent([rs.data]);
+  async enabled(params) {
+    var rs = await this.callms("common", "deliverEnable", params);
+    this.synEnabled(params);
     return rs;
   }
 
-  async save(params) {
-    params.invoiceDivide = system.y2f(params.invoiceDivide);
-    params.businessmenDivide = system.y2f(params.businessmenDivide);
-    var rs = await this.callms("common", "deliverSave", params);
-    await this.doPercent([rs.data]);
-    return rs;
+  async synEnabled(params) {
+    var rs = await this.callms("common", "deliverInfo", params);
+    let deliver = rs.data;
+    if(!deliver) {
+      return;
     }
 
-  async del(params) {
-    return await this.callms("common", "deliverDelete", params);
+    let data = {
+      companyNo: deliver.id,
+      name: deliver.name,
+      serviceStatus: deliver.isEnabled ? 1 : 0,
     }
 
-  async deliverUserPage(params) {
-    return await this.callms("common", "deliverUserPage", params);
+    let url = settings.ntapi().updateCompanyStatus;
+    this.callApi(url, data, "启用/禁用");
   }
-  async deliverUserById(params) {
-    return await this.callms("common", "deliverUserById", params);
+
+  async resetPassword(params) {
+    var rs = await this.callms("common", "deliverResetPassword", params);
+    return rs;
   }
-  async deliverUserSave(params) {
-    let rs = await this.callms("common", "deliverUserSave", params);
-    if(!params.id && rs.status === 0) {
-      this.synSave(rs.data.id, params.password);
+
+  async save(params) {
+    params.invoiceDivide = 0;
+    params.businessmenDivide = 0;
+    var rs = await this.callms("common", "deliverSave", params);
+    await this.doPercent([rs.data]);
+    if(rs && rs.data && rs.data.id) {
+      this.synSave(rs.data.admin_id, params.password);
     }
     return rs;
   }
 
   async synSave(id, password) {
+    let rs = await this.callms("common", "deliverUserInfo", {id: id});
+    if(!rs || !rs.data || !rs.data.user || !rs.data.deliver) {
+      return;
     }
 
-  async allOrg(params) {
-    return await this.callms("common", "allOrg", params);
+    let user = rs.data.user;
+    // 是否已经推送过
+    if (user.nt_user_id) {
+      return;
     }
-  async orgTree(params) {
-    return await this.callms("common", "orgTree", params);
+
+    let deliver = rs.data.deliver;
+    let data = {
+      companyNo: deliver.id,
+      companyName: deliver.name,
+      path: user.org_path,
+      staffNo: user.id,
+      staffName: user.real_name,
+      loginId: user.ucname,
+      pwd: password,
+    };
+    if(user.id = deliver.admin_id) {
+      data.classType = "manager";
+      data.className = "管理员";
+    } else {
+      if(user.isAdmin) {
+        data.classType = "leader";
+        data.className = "主管";
+      } else {
+        data.classType = "member";
+        data.className = " 普通员工";
+      }
+    }
+    let url = settings.ntapi().synUserDetails;
+    let res = await this.callApi(url, data, "创建交付商");
+    if(res && res.data && res.data.datas) {
+      let _d = res.data.datas;
+      await this.callms("common", "deliverSynUpdate", {user_id: id, nt_user_id: _d.id, nt_company_id: _d.companyId});
     }
-  async orgById(params) {
-    return await this.callms("common", "orgById", params);
   }
-  async orgSave(params) {
-    return await this.callms("common", "orgSave", params);
+
+  async del(params) {
+    return await this.callms("common", "deliverDelete", params);
   }
 
   async doPercent(rows) {

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

@@ -191,7 +191,7 @@ class System {
       let dev = "http://39.107.234.14";
       return {
         // 公共服务
-        common: dev + ":3102" + path,
+        common: local + ":3102" + path,
 
         // 商户服务
         merchant: dev + ":3101" + path,

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

@@ -88,6 +88,37 @@ var settings = {
       return "https://open.gongsibao.com/web/common/metaCtl/getApiDoc";
     }
   },
+  ntapi: function () {
+    let domain = "";
+    let domain_page = "";
+    if (this.env == "dev") {
+      domain = "https://nt-api.gongsibao.com";
+      domain_page = "https://nt.gongsibao.com";
+    } else {
+      domain = "https://nga-api.gongsibao.com";
+      domain_page = "https://ali-saas.gongsibao.com";
+    }
+    return {
+      // 税务登录地址
+      taxLoginUrl: domain_page + "/web/auth",
+      // 财务地址
+      finLoginUrl: domain_page + "/web/auth",
+      // 创建交付商&管理员
+      synUserDetails: domain + "/nga-api/synUserDetails",
+      // 交付商启用/禁用
+      updateCompanyStatus: domain + "/nga-api/company/updateCompanyStatus",
+      // 建账
+      createCustomer: domain + "/nga-api/createCustomer",
+      // 上传发票
+      uploadDetail: domain + "/nga-api/uploadDetail",
+      // 获取用户账簿
+      getCustomerById: domain + "/nga-api/getCustomerById",
+      // 月报表
+      getReportData: domain + "/nga-api/report/getReportData",
+      // 季报表
+      getReportDataQuarter: domain + "/nga-api/report/getReportDataQuarter"
+    };
+  },
   deliverSysApi: function () {
     let domain = "";
     if (this.env == "dev") {