gsb

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

@@ -9,6 +9,7 @@ class ActionAPI extends APIBase {
         this.captchaSve = system.getObject("service.common.captchaSve");
         this.captchaSve = system.getObject("service.common.captchaSve");
 
 
         this.deliverSve = system.getObject("service.deliver.deliverSve");
         this.deliverSve = system.getObject("service.deliver.deliverSve");
+        this.deliverschemeSve = system.getObject("service.deliver.deliverschemeSve");
 
 
         this.invoicecontentSve = system.getObject("service.common.invoicecontentSve");
         this.invoicecontentSve = system.getObject("service.common.invoicecontentSve");
         this.smsinfoSve = system.getObject("service.common.smsinfoSve");
         this.smsinfoSve = system.getObject("service.common.smsinfoSve");
@@ -172,6 +173,19 @@ class ActionAPI extends APIBase {
                 opResult = await this.invoicecontentSve.getAll(action_body);
                 opResult = await this.invoicecontentSve.getAll(action_body);
                 break;
                 break;
 
 
+            // 交付商方案
+            case "deliverschemeSave":
+                opResult = await this.deliverschemeSve.save(action_body);
+                break;
+            case "deliverschemeInfo":
+                opResult = await this.deliverschemeSve.info(action_body);
+                break;
+            case "deliverschemePage":
+                opResult = await this.deliverschemeSve.pageByCondition(action_body);
+                break;
+            case "deliverschemeDics":
+                opResult = await this.deliverschemeSve.dics(action_body);
+                break;
             // 阿里短信服务
             // 阿里短信服务
             case "sendSms":               //发送短信
             case "sendSms":               //发送短信
                 opResult = await this.smsinfoSve.sendSms(action_body);
                 opResult = await this.smsinfoSve.sendSms(action_body);

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

 const system = require("../../../system");
 const system = require("../../../system");
 const Dao = require("../../dao.base");
 const Dao = require("../../dao.base");
-class DeliveruserDao extends Dao {
+class DeliverSchemeDao extends Dao {
   constructor() {
   constructor() {
-    super(Dao.getModelName(DeliveruserDao));
+    super(Dao.getModelName(DeliverSchemeDao));
   }
   }
 
 
-  async findByUcname(ucname) {
-    let sql = "SELECT * FROM d_deliver_user WHERE ucname = :ucname";
-    let list = await this.customQuery(sql, {ucname: ucname});
-    if(!list) {
-      return null;
+  async dics(params) {
+    var sql = [];
+    sql.push("SELECT");
+    sql.push(params.attrs || "id, name");
+    sql.push("FROM");
+    sql.push(this.model.tableName);
+    sql.push("WHERE deleted_at IS NULL ");
+    if (params.deliver_id) {
+      sql.push("AND deliver_id = :deliver_id");
+    }
+    sql.push("ORDER BY created_at ASC");
+    return await this.customQuery(sql.join(" "), params);
+  }
+
+  async countByCondition(params) {
+    var sql = [];
+    sql.push("SELECT");
+    sql.push("count(1) as num");
+    sql.push("FROM");
+    sql.push(this.model.tableName);
+    sql.push("WHERE deleted_at IS NULL");
+
+    this.setCondition(sql, params);
+
+    var list = await this.customQuery(sql.join(" "), params);
+    if (!list || list.length == 0) {
+      return 0;
+    }
+    return list[0].num;
+  }
+
+  async listByCondition(params) {
+    params.startRow = Number(params.startRow || 0);
+    params.pageSize = Number(params.pageSize || 10);
+    var sql = [];
+    sql.push("SELECT");
+    sql.push(params.attrs || "*");
+    sql.push("FROM");
+    sql.push(this.model.tableName);
+    sql.push("WHERE deleted_at IS NULL");
+
+    this.setCondition(sql, params);
+
+    sql.push("ORDER BY created_at DESC");
+    sql.push("LIMIT :startRow, :pageSize");
+    return await this.customQuery(sql.join(" "), params);
+  }
+
+  setCondition(sql, params) {
+    if (!params || !sql) {
+      return;
+    }
+    if (params.deliver_id) {
+      sql.push("AND deliver_id = :deliver_id");
+    }
+    if (params.name) {
+      params.nameLike = `%${params.name}%`;
+      sql.push("AND name LIKE :nameLike");
+    }
+    if (params.createBegin) {
+      sql.push("AND created_at >= :createBegin");
+    }
+    if (params.createEnd) {
+      sql.push("AND created_at <= :createEnd");
     }
     }
-    return list[0];
   }
   }
 
 
   async findListByIds(ids) {
   async findListByIds(ids) {
@@ -43,7 +101,7 @@ class DeliveruserDao extends Dao {
     return result;
     return result;
   }
   }
 }
 }
-module.exports = DeliveruserDao;
+module.exports = DeliverSchemeDao;
 // var u=new UserDao();
 // var u=new UserDao();
 // var roledao=system.getObject("db.roleDao");
 // var roledao=system.getObject("db.roleDao");
 // (async ()=>{
 // (async ()=>{

xggsve-common/app/base/db/models/deliver/deliverscheme.js

@@ -2,19 +2,17 @@ const system = require("../../../system");
 const settings = require("../../../../config/settings");
 const settings = require("../../../../config/settings");
 const uiconfig = system.getUiConfig2(settings.appKey);
 const uiconfig = system.getUiConfig2(settings.appKey);
 module.exports = (db, DataTypes) => {
 module.exports = (db, DataTypes) => {
-  return db.define("deliver", {
+  return db.define("deliverscheme", {
+    deliver_id: DataTypes.STRING,
     name: DataTypes.STRING,
     name: DataTypes.STRING,
-    businessmenDivide: DataTypes.INTEGER,
-    invoiceDivide: DataTypes.INTEGER,
-    admin_id: DataTypes.STRING,
-    remark: DataTypes.STRING,
-
-    isEnabled: {
-      type: DataTypes.BOOLEAN,
-      allowNull: true,
-    },
-    nt_company_id: DataTypes.STRING,
-    saas_id: DataTypes.STRING,
+    common_tax_ladder: DataTypes.STRING,
+    common_other_ladder: DataTypes.STRING,
+    special_tax_ladder: DataTypes.STRING,
+    special_other_ladder: DataTypes.STRING,
+    cost_rate: DataTypes.INTEGER,
+    tax_rate: DataTypes.INTEGER,
+    add_value_up_type: DataTypes.STRING,
+    tax_up_type: DataTypes.STRING,
   }, {
   }, {
     paranoid: true, //假的删除
     paranoid: true, //假的删除
     underscored: true,
     underscored: true,
@@ -22,7 +20,7 @@ module.exports = (db, DataTypes) => {
     freezeTableName: true,
     freezeTableName: true,
     //freezeTableName: true,
     //freezeTableName: true,
     // define the table's name
     // define the table's name
-    tableName: 'd_deliver',
+    tableName: 'd_deliver_scheme',
     validate: {},
     validate: {},
     indexes: [
     indexes: [
       // Create a unique index on email
       // Create a unique index on email