gbs

xggsve-common/app/base/api/impl/op/action.js

@@ -115,7 +115,29 @@ class ActionAPI extends APIBase {
             case "deliverUserMap":
             case "deliverUserMap":
                 opResult = await this.deliverSve.deliverUserMap(action_body);
                 opResult = await this.deliverSve.deliverUserMap(action_body);
                 break;
                 break;
-
+            case "deliverUserPage":
+                opResult = await this.deliverSve.deliverUserPage(action_body);
+                break;
+            case "deliverUserById":
+                opResult = await this.deliverSve.deliverUserById(action_body);
+                break;
+            case "deliverUserSave":
+                opResult = await this.deliverSve.deliverUserSave(action_body);
+                break;
+       
+            case "orgTree":
+                opResult = await this.deliverSve.orgTree(action_body);
+                break;
+            case "allOrg": 
+                opResult = await this.deliverSve.allOrg(action_body);
+                break;
+            case "orgById":
+                opResult = await this.deliverSve.orgById(action_body);
+                break;
+            case "orgSave":
+                opResult = await this.deliverSve.orgSave(action_body);
+                break;
+                
             // 发票内容
             // 发票内容
             case "invoicecontentSave":
             case "invoicecontentSave":
                 opResult = await this.invoicecontentSve.apiSave(action_body);
                 opResult = await this.invoicecontentSve.apiSave(action_body);
@@ -141,6 +163,7 @@ class ActionAPI extends APIBase {
                 opResult = await this.smsinfoSve.querySmsInfos(action_body);
                 opResult = await this.smsinfoSve.querySmsInfos(action_body);
                 break;  
                 break;  
                   
                   
+            
                 
                 
             default:
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 opResult = system.getResult(null, "action_type参数错误");

xggsve-common/app/base/db/impl/deliver/deliverorgDao.js

@@ -5,6 +5,17 @@ class DeliverorgDao extends Dao {
     super(Dao.getModelName(DeliverorgDao));
     super(Dao.getModelName(DeliverorgDao));
   }
   }
 
 
+
+  async byDeliverId(deliver_id, attrs) {
+    attrs = attrs || "*";
+    var sql = [];
+    sql.push("SELECT");
+    sql.push(attrs);
+    sql.push("FROM d_deliver_org");
+    sql.push("WHERE deliver_id = :deliver_id AND deleted_at IS NULL");
+    return this.customQuery(sql.join(" "), {deliver_id: deliver_id});
+  }
+
   async findListByIds(ids) {
   async findListByIds(ids) {
     if (!ids || ids.length == 0) {
     if (!ids || ids.length == 0) {
       return [];
       return [];
@@ -33,6 +44,8 @@ class DeliverorgDao extends Dao {
     }
     }
     return result;
     return result;
   }
   }
+
+
 }
 }
 module.exports = DeliverorgDao;
 module.exports = DeliverorgDao;
 // var u=new UserDao();
 // var u=new UserDao();

xggsve-common/app/base/service/impl/deliver/deliverSve.js

@@ -115,7 +115,7 @@ class DeliverService extends ServiceBase {
     if (!user) {
     if (!user) {
       let exists = await this.deliveruserDao.findOne({ucname: params.ucname});
       let exists = await this.deliveruserDao.findOne({ucname: params.ucname});
       if(exists) {
       if(exists) {
-        return system.getResult(null, `用户名[${params.ucname}]重复`);
+        return system.getResult(null, `用户名【${params.ucname}】已存在`);
       }
       }
     }
     }
 
 
@@ -276,6 +276,213 @@ class DeliverService extends ServiceBase {
     }
     }
     return result;
     return result;
   }
   }
+
+  async deliverUserPage(params) {
+    let currentPage = Number(params.currentPage || 1);
+    let pageSize = Number(params.pageSize || 10);
+
+    let deliver_id = params.deliver_id;
+    if(!deliver_id) {
+      return system.getResultSuccess({count:0, rows:[], msg:"deliver_id is empty"});
+    }
+
+    let where = {
+      deliver_id: deliver_id
+    };
+
+    let orderby = [
+      ["id", 'desc']
+    ];
+
+    let page = await this.getPageList(currentPage, pageSize, where, orderby, null);
+    if (page && page.rows) {
+      for (var row of page.rows) {
+        this.handleDate(row, ["created_at"], null, -8);
+        this.setAuth(row);
+      }
+      await this.setUser(page.rows);
+    }
+    return system.getResultSuccess(page);
+  }
+
+  setAuth(row) {
+    let auth = row.auth;
+    if(!auth || auth.length < 4) {
+      return;
+    }
+    let gsb = Number(user.auth[0] || 0);
+    let cwb = Number(user.auth[1] || 0);
+    let swb = Number(user.auth[2] || 0);
+    let pjb = Number(user.auth[3] || 0);
+    let authArr = [];
+
+    let authNames = [];
+    if(gsb) {
+      authArr.push(1);
+      authNames.push("工商宝");
+    }
+    if(cwb) {
+      authArr.push(2);
+      authNames.push("财务宝");
+    }
+    if(swb) {
+      authArr.push(3);
+      authNames.push("税务宝");
+    }
+    if(pjb) {
+      authArr.push(4);
+      authNames.push("票据宝");
+    }
+    user.auth = authArr.join("");
+    row.authNames = authNames.join("、");
+  }
+
+  async deliverUserById(params) {
+    let id = params.id;
+    let user = await this.deliveruserDao.getById(id) || {};
+    user.password = "";
+    this.setAuth(user);
+  }
+  async deliverUserSave(params) {
+    let deliver_id = params.deliver_id;
+    if(!deliver_id) {
+      return system.getResult(null, "交付商不存在");
+    }
+
+    let id = params.id;
+    let real_name = this.trim(params.real_name);
+    let ucname = this.trim(params.ucname);
+    let org_id = params.org_id;
+    let password = params.password;
+    let isAdmin = Number(params.isAdmin || 0);
+    let authArr = params.auth || [];
+
+    let deliver = await this.dao.findById(deliver_id);
+    if(!deliver) {
+      return system.getResult(null, "交付商不存在");
+    }
+
+    let org = await this.deliverorgDao.findById(org_id);
+    if(!org) {
+      return system.getResult(null, "组织机构不存在");
+    }
+    let user;
+    if(id) {
+      user = await this.deliveruserDao.findById(id);
+    } else {
+      user = await this.deliveruserDao.findOne({ucname: ucname});
+      if(user) {
+        return system.getResult(null, `账号【${ucname}】已存在`)
+      }
+      user = {};
+    }
+
+    user.real_name = real_name;
+    user.org_id = org_id;
+    user.org_path = org.path;
+    user.isAdmin = isAdmin ? true : false;
+    let auth = [];
+    for (let i = 1; i <= 4; i++) {
+      if(authArr.indexOf(i.toString()) == -1) {
+        auth.push("0");
+      } else {
+        auth.push("1");
+      }
+    }
+    user.auth = auth.join("");
+
+    if(user.id) {
+      await user.save();
+    } else {
+      user.saas_id = deliver.saas_id;
+      user.deliver_id = deliver.id;
+      user.ucname = params.ucname;
+      user.password = await this.getEncryptStr(params.password);
+      user = await this.deliveruserDao.model.create(user);
+    }
+
+    return system.getResultSuccess();
+  }
+
+  async orgTree(params) {
+    try {
+      let deliver_id = params.deliver_id;
+      if(!deliver_id) {
+        return system.getResult(null, "交付商不存在");
+      }
+  
+      var all = await this.deliverorgDao.byDeliverId(params.deliver_id, '');
+      var pmap = {};
+      for (var item of all) {
+        item.label =  item.name;
+        var list = pmap[item.parent_id] || [];
+        list.push(item);
+        pmap[item.parent_id] = list;
+      }
+      for(var item of all) {
+        item.children = pmap[item.parent_id] || [];
+      }
+      return system.getResult(pmap[0]);
+    } catch (error) {
+      return system.getResult(-1, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  async orgById(params) {
+    let org = await this.deliverorgDao.getById(params.id) || "";
+    return system.getResultSuccess(org);
+  }
+
+  async allOrg(params) {
+    let deliver_id = params.deliver_id;
+    if(!deliver_id) {
+      return system.getResultSuccess([]);
+    }
+    var all = await this.deliverorgDao.byDeliverId(params.deliver_id, '');
+    return system.getResultSuccess(all || []);
+  }
+
+  async orgSave(params) {
+    let id = params.id;
+    let pid = params.pid;
+    let name = params.name;
+    let deliver_id = params.deliver_id;
+    if(!pid) {
+      return system.getResult(null, "请选择上级部门");
+    }
+
+    let parent = await this.deliverorgDao.findById(pid);
+    if(!parent) {
+      return system.getResult(null, "上级部门不存在");
+    }
+    if(!name) {
+      return system.getResult(null, "请填写部门名称");
+    }
+    if(!deliver_id) {
+      return system.getResult(null, "交付商不存在");
+    }
+
+    let org;
+    if(id) {
+      org = await this.deliverorgDao.findById(id);
+    } else {
+      org = {};
+    }
+    org.deliver_id = deliver_id;
+    org.name = name;
+    org.parent_id = pid;
+    org.path = parent.path + name + ".";
+    org.type = '';
+    org.del_flag = 0;
+    org.group_type = 0;
+    if(org.id) {
+      await org.save();
+    } else {
+      org = await this.deliverorgDao.model.create(org);
+    }
+    return system.getResultSuccess();
+  }
+
 }
 }
 
 
 module.exports = DeliverService;
 module.exports = DeliverService;