gsb

xggsve-order/app/base/db/impl/order/iborderbaseDao.js

@@ -5,5 +5,27 @@ class IborderbaseDao extends Dao {
     super(Dao.getModelName(IborderbaseDao));
     super(Dao.getModelName(IborderbaseDao));
     this.statusMap = {};
     this.statusMap = {};
   }
   }
+
+  async findMapByIds(ids, attrs) {
+    var result = {};
+    if (!ids || ids.length == 0) {
+      return result;
+    }
+    attrs = attrs || "*";
+    var sql = "SELECT " + attrs + " FROM `ib_orderbase` WHERE id IN (:ids)";
+
+    var list = await this.customQuery(sql, {
+      ids: ids
+    });
+
+    if (!list || list.length == 0) {
+      return result;
+    }
+
+    for (var item of list) {
+      result[item.id] = item;
+    }
+    return result;
+  }
 }
 }
 module.exports = IborderbaseDao;
 module.exports = IborderbaseDao;
\ No newline at end of file

xggsve-order/app/base/service/impl/business/businessmenSve.js

 const system = require("../../../system");
 const system = require("../../../system");
 const ServiceBase = require("../../sve.base")
 const ServiceBase = require("../../sve.base")
 const settings = require("../../../../config/settings")
 const settings = require("../../../../config/settings")
+
 class BusinessmenService extends ServiceBase {
 class BusinessmenService extends ServiceBase {
   constructor() {
   constructor() {
     super("business", ServiceBase.getDaoName(BusinessmenService));
     super("business", ServiceBase.getDaoName(BusinessmenService));
@@ -80,6 +81,7 @@ class BusinessmenService extends ServiceBase {
       return system.getResult(null, "接口异常");
       return system.getResult(null, "接口异常");
     }
     }
   }
   }
+
   async apiDeliverPage(params) {
   async apiDeliverPage(params) {
     try {
     try {
       return await this.deliverPage(params);
       return await this.deliverPage(params);
@@ -271,7 +273,7 @@ class BusinessmenService extends ServiceBase {
   async getCompleteMapByCreditCodes(params) {
   async getCompleteMapByCreditCodes(params) {
     var result = {};
     var result = {};
     var attrs = "id, creditCode, name, isBank, taxOrg, taxUpType, addValueUpType, costRate, " +
     var attrs = "id, creditCode, name, isBank, taxOrg, taxUpType, addValueUpType, costRate, " +
-      "taxRate, serviceRate,commonTaxLadder,commonOtherLadder,specialTaxLadder,specialOtherLadder";
+        "taxRate, serviceRate,commonTaxLadder,commonOtherLadder,specialTaxLadder,specialOtherLadder";
 
 
     var condition = {
     var condition = {
       creditCodes: params.creditCodes,
       creditCodes: params.creditCodes,
@@ -378,7 +380,7 @@ class BusinessmenService extends ServiceBase {
     }
     }
     return system.getResultSuccess(page);
     return system.getResultSuccess(page);
   }
   }
-  
+
   async deliverPage(params) {
   async deliverPage(params) {
     var currentPage = Number(params.currentPage || 1);
     var currentPage = Number(params.currentPage || 1);
     var pageSize = Number(params.pageSize || 10);
     var pageSize = Number(params.pageSize || 10);
@@ -448,25 +450,28 @@ class BusinessmenService extends ServiceBase {
     bm.serviceRate = params.serviceRate;
     bm.serviceRate = params.serviceRate;
     bm.signNotes = this.trim(params.signNotes);
     bm.signNotes = this.trim(params.signNotes);
 
 
-    bm.commonTaxLadder = params.commonTaxLadder || "";
-    bm.commonOtherLadder = params.commonOtherLadder || "";
-    bm.specialTaxLadder = params.specialTaxLadder || "";
-    bm.specialOtherLadder = params.specialOtherLadder || "";
+    bm.serviceBeginTime = pobj.serviceBeginTime;
+    bm.serviceEndTime = pobj.serviceEndTime;
+
+    bm.commonTaxLadder = params.commonTaxLadder || "[]";
+    bm.commonOtherLadder = params.commonOtherLadder || "[]";
+    bm.specialTaxLadder = params.specialTaxLadder || "[]";
+    bm.specialOtherLadder = params.specialOtherLadder || "[]";
     bm.signTime = new Date();
     bm.signTime = new Date();
     await bm.save();
     await bm.save();
 
 
     var iclist = params.invoicecontents || [];
     var iclist = params.invoicecontents || [];
     await this.businessmeninvoicecontentDao.delByBusinessmenId(bm.id);
     await this.businessmeninvoicecontentDao.delByBusinessmenId(bm.id);
     var icobjs = [];
     var icobjs = [];
-    for(var ic of iclist) {
-      if(!ic) {
+    for (var ic of iclist) {
+      if (!ic) {
         continue;
         continue;
       }
       }
       delete ic.id;
       delete ic.id;
       ic.businessmen_id = bm.id;
       ic.businessmen_id = bm.id;
       icobjs.push(ic);
       icobjs.push(ic);
     }
     }
-    if(icobjs.length > 0) {
+    if (icobjs.length > 0) {
       await this.businessmeninvoicecontentDao.bulkCreate(icobjs);
       await this.businessmeninvoicecontentDao.bulkCreate(icobjs);
     }
     }
     return system.getResultSuccess();
     return system.getResultSuccess();
@@ -490,4 +495,5 @@ class BusinessmenService extends ServiceBase {
   }
   }
 
 
 }
 }
+
 module.exports = BusinessmenService;
 module.exports = BusinessmenService;

xggsve-order/app/base/service/impl/order/iborderbaseSve.js

@@ -125,7 +125,11 @@ class IborderbaseService extends ServiceBase {
   async apiOrders(params){
   async apiOrders(params){
     try {
     try {
       let childSve = this.getService(params.productType);
       let childSve = this.getService(params.productType);
-      return await childSve.orderPage(params);
+      let page = await childSve.orderPage(params);
+      if(page && page.rows) {
+        this.setBaseOrder(page.rows);
+      }
+      return page;
     } catch (error) {
     } catch (error) {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
     }
@@ -211,6 +215,22 @@ class IborderbaseService extends ServiceBase {
       return system.getResult(null, "接口异常");
       return system.getResult(null, "接口异常");
     }
     }
   }
   }
+
+  async setBaseOrder(rows) {
+    if (!rows || rows.length == 0) {
+      return;
+    }
+
+    var ids = [];
+    for (var row of rows) {
+      ids.push(row.id);
+    }
+    let map = await this.dao.findMapByIds(ids);
+
+    for (var row of rows) {
+      row.baseInfo = map(row.id);
+    }
+  }
 }
 }
 
 
 module.exports = IborderbaseService;
 module.exports = IborderbaseService;
\ No newline at end of file