Skip to content

Z
zhichan
Commit bfd813e2 by 王昆
Options

gsb

parent f460c0de
Showing with 142 additions and 179 deletions
xggsve-invoice/app/base/api/impl/op/action.js
...@@ -5,6 +5,10 @@ class ActionAPI extends APIBase { ...@@ -5,6 +5,10 @@ class ActionAPI extends APIBase {
constructor() { constructor() {
super(); super();
this.iinvoiceSve = system.getObject("service.invoice.iinvoiceSve"); this.iinvoiceSve = system.getObject("service.invoice.iinvoiceSve");
this.iproductSve = system.getObject("service.product.iproductSve");
this.iprocessSve = system.getObject("service.product.iprocessSve");
} }
/** /**
* 接口跳转 * 接口跳转
...@@ -40,9 +44,8 @@ class ActionAPI extends APIBase { ...@@ -40,9 +44,8 @@ class ActionAPI extends APIBase {
case "productDics": // 查询产品字典 case "productDics": // 查询产品字典
// opResult = await this.oproductSve.productDics(action_body); // opResult = await this.oproductSve.productDics(action_body);
break; break;
case "allProcess": // 查询业务进度 case "allProcess": // 查询业务进度
// opResult = await this.oprocessSve.allNames(action_body); opResult = await this.iprocessSve.allNames(action_body);
break; break;
// case "verificationAndCalculation": // 发票试算接口 // case "verificationAndCalculation": // 发票试算接口
......
xggsve-invoice/app/base/db/impl/invoice/iinvoiceDao.js
...@@ -10,9 +10,8 @@ class IInvoiceDao extends Dao { ...@@ -10,9 +10,8 @@ class IInvoiceDao extends Dao {
var sql = []; var sql = [];
sql.push("SELECT"); sql.push("SELECT");
sql.push("COUNT(1) as total"); sql.push("COUNT(1) as total");
sql.push("FROM `invoice` t1"); sql.push("FROM `i_invoice` t1");
sql.push("INNER JOIN `invoice_apply` t2 ON t1.`id` = t2.`id`"); sql.push("WHERE 1 = 1 ");
sql.push("WHERE 1 = 1 and t2.status in('1070','1080','1090')");
this.setCondition(params, sql); this.setCondition(params, sql);
...@@ -27,8 +26,7 @@ class IInvoiceDao extends Dao { ...@@ -27,8 +26,7 @@ class IInvoiceDao extends Dao {
var sql = []; var sql = [];
sql.push("SELECT"); sql.push("SELECT");
sql.push("t1.*"); sql.push("t1.*");
sql.push("FROM `invoice` t1"); sql.push("FROM `i_invoice` t1");
sql.push("INNER JOIN `invoice_apply` t2 ON t1.`id` = t2.`id`");
sql.push("WHERE 1 = 1 "); sql.push("WHERE 1 = 1 ");
this.setCondition(params, sql); this.setCondition(params, sql);
...@@ -41,116 +39,115 @@ class IInvoiceDao extends Dao { ...@@ -41,116 +39,115 @@ class IInvoiceDao extends Dao {
} }
setCondition(params, sql) { setCondition(params, sql) {
var complateTax = params.complateTax; if(params.apply_no) {
if (complateTax != "-1") { sql.push("AND t2.`apply_no` = :apply_no");
params.complateTax = Number(complateTax);
sql.push("AND t1.`complate_tax` = :complateTax");
}
// invoiceTimeBegin 2019-01-01 2019-01-01 00:00:00
// invoiceTimeEnd 2019-11-01 2019-11-01 23:59:59
if(params.invoiceTimeBegin) {
sql.push("AND t1.`invoice_time` >= :invoiceTimeBegin");
}
if(params.invoiceTimeEnd) {
sql.push("AND t1.`invoice_time` <= :invoiceTimeEnd");
}
if(params.invoiceTime){
sql.push("AND t1.`invoice_time` >= :invoiceTime");
}
if(params.applyNo) {
sql.push("AND t2.`apply_no` = :applyNo");
} }
if(params.status) {
if(params.redStatus) { sql.push("AND t2.`status` = :status");
sql.push("AND t1.`red_status` = :redStatus");
}
if (params.type) {
sql.push("AND t2.`type` = :type");
} }
if(params.statuses && params.statuses.length > 0){ if(params.statuses && params.statuses.length > 0){
sql.push("AND t2.`status` in (:statuses)"); sql.push("AND t2.`status` in (:statuses)");
} }
if(params.invoice_type) {
sql.push("AND t2.`invoice_type` = :invoice_type");
} }
if(params.invoiceTimeBegin) {
sql.push("AND t1.`invoice_time` >= :invoiceTimeBegin");
/**
* 红冲列表总计
* @param {*} params
*/
async countRedRushListByParams(params){
var sql = [];
sql.push(`select count(1) as count from invoice_apply a inner join invoice_deliverer b on a.deliverer_id =b.id
inner join invoice c on b.invoice_id =c.id where a.id = c.id `);
if (params.delivererId) {
sql.push(` AND b.deliverer_id = :delivererId`);
}
if (params.applyNo) {
sql.push(` AND a.apply_no = :applyNo`);
}
if (params.invoiceNo) {
sql.push(` AND c.invoice_no = :invoiceNo`);
}
if (params.startTime) {
sql.push(`and a.invoice_time >= :startTime`);
}
if (params.endTime) {
sql.push(`and a.invoice_time <= :endTime`);
}
if(params.invoiceTime){
sql.push(`and a.invoice_time >= :invoiceTime`);
}
if (params.type) {
sql.push(`and a.type = :type`);
}
if (params.redStatus) {
sql.push(`and c.red_status = :redStatus`);
}
if (params.status) {
sql.push(`and c.status = :status`);
} }
return await this.customQuery(sql.join(" "), params); if(params.invoiceTimeEnd) {
sql.push("AND t1.`invoice_time` <= :invoiceTimeEnd");
} }
/** if(params.red_status) {
* 红冲列表 sql.push("AND t1.`red_status` = :red_status");
* @param {*} params }
*/ if(params.deliver_id) {
async redRushListByParams(params){ sql.push("AND t2.`deliver_id` = :deliver_id");
var sql = []; }
sql.push(`select a.apply_no,a.type,a.invoice_amount,a.invoice_time,c.status, if(params.bd_id) {
a.merchant_name,a.businessmen_name,a.id,b.deliverer_id from invoice_apply a sql.push("AND t2.`bd_id` = :bd_id");
inner join invoice_deliverer b on a.deliverer_id =b.id }
inner join invoice c on b.invoice_id =c.id where a.id = c.id `); if(params.bd_path) {
params.bd_path_like = params.bd_path + "%";
if (params.delivererId) { sql.push("AND t2.`bd_path` = :bd_path_like");
sql.push(` AND b.deliverer_id = :delivererId`); }
} }
if (params.applyNo) {
sql.push(` AND a.apply_no = :applyNo`); // /**
} // * 红冲列表总计
if (params.startTime) { // * @param {*} params
sql.push(`and a.invoice_time >= :startTime`); // */
} // async countRedRushListByParams(params){
if (params.endTime) { // var sql = [];
sql.push(`and a.invoice_time <= :endTime`);
} // sql.push(`select count(1) as count from invoice_apply a inner join invoice_deliverer b on a.deliverer_id =b.id
if(params.invoiceTime){ // inner join invoice c on b.invoice_id =c.id where a.id = c.id `);
sql.push(`and a.invoice_time >= :invoiceTime`);
} // if (params.delivererId) {
if (params.type) { // sql.push(` AND b.deliverer_id = :delivererId`);
sql.push(`and a.type = :type`); // }
} // if (params.applyNo) {
if (params.redStatus) { // sql.push(` AND a.apply_no = :applyNo`);
sql.push(`and c.red_status = :redStatus`); // }
} // if (params.invoiceNo) {
sql.push("ORDER BY c.id DESC"); // sql.push(` AND c.invoice_no = :invoiceNo`);
sql.push("LIMIT :statRow, :pageSize"); // }
return await this.customQuery(sql.join(" "), params); // if (params.startTime) {
} // sql.push(`and a.invoice_time >= :startTime`);
// }
// if (params.endTime) {
// sql.push(`and a.invoice_time <= :endTime`);
// }
// if(params.invoiceTime){
// sql.push(`and a.invoice_time >= :invoiceTime`);
// }
// if (params.type) {
// sql.push(`and a.type = :type`);
// }
// if (params.redStatus) {
// sql.push(`and c.red_status = :redStatus`);
// }
// if (params.status) {
// sql.push(`and c.status = :status`);
// }
// return await this.customQuery(sql.join(" "), params);
// }
// /**
// * 红冲列表
// * @param {*} params
// */
// async redRushListByParams(params){
// var sql = [];
// sql.push(`select a.apply_no,a.type,a.invoice_amount,a.invoice_time,c.status,
// a.merchant_name,a.businessmen_name,a.id,b.deliverer_id from invoice_apply a
// inner join invoice_deliverer b on a.deliverer_id =b.id
// inner join invoice c on b.invoice_id =c.id where a.id = c.id `);
// if (params.delivererId) {
// sql.push(` AND b.deliverer_id = :delivererId`);
// }
// if (params.applyNo) {
// sql.push(` AND a.apply_no = :applyNo`);
// }
// if (params.startTime) {
// sql.push(`and a.invoice_time >= :startTime`);
// }
// if (params.endTime) {
// sql.push(`and a.invoice_time <= :endTime`);
// }
// if(params.invoiceTime){
// sql.push(`and a.invoice_time >= :invoiceTime`);
// }
// if (params.type) {
// sql.push(`and a.type = :type`);
// }
// if (params.redStatus) {
// sql.push(`and c.red_status = :redStatus`);
// }
// sql.push("ORDER BY c.id DESC");
// sql.push("LIMIT :statRow, :pageSize");
// return await this.customQuery(sql.join(" "), params);
// }
} }
module.exports = IInvoiceDao; module.exports = IInvoiceDao;
\ No newline at end of file
xggsve-invoice/app/base/db/impl/invoice/iinvoicedeliverDao.js
...@@ -6,6 +6,21 @@ class IinvoicedeliverDao extends Dao { ...@@ -6,6 +6,21 @@ class IinvoicedeliverDao extends Dao {
this.tableName = this.model.tableName; this.tableName = this.model.tableName;
} }
async findMapByIds(ids) {
var result = {};
var sql = `SELECT * FROM ${this.tableName} 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;
}
//交付商业务概览 //交付商业务概览
async countStat(params) { async countStat(params) {
var sql = []; var sql = [];
......
xggsve-invoice/app/base/db/impl/invoice/iinvoiceprocessDao.js
...@@ -7,16 +7,16 @@ class IInvoiceprocessDao extends Dao { ...@@ -7,16 +7,16 @@ class IInvoiceprocessDao extends Dao {
this.tableName = this.model.tableName; this.tableName = this.model.tableName;
} }
async delByOrderId(order_id) { async delByInvoiceId(invoice_id) {
if (!order_id) { if (!invoice_id) {
return; return;
} }
let sql = `DELETE FROM ${this.tableName} WHERE order_id = :order_id`; let sql = `DELETE FROM ${this.tableName} WHERE invoice_id = :invoice_id`;
await this.customUpdate(sql, {order_id: order_id}); await this.customUpdate(sql, {invoice_id: invoice_id});
} }
async findByOrderIdAndStatus(orderId, status) { async findByInvoiceIdAndStatus(invoiceId, status) {
if (!orderId || !status) { if (!invoiceId || !status) {
return null; return null;
} }
let sql = []; let sql = [];
...@@ -24,19 +24,19 @@ class IInvoiceprocessDao extends Dao { ...@@ -24,19 +24,19 @@ class IInvoiceprocessDao extends Dao {
sql.push("*"); sql.push("*");
sql.push("FROM"); sql.push("FROM");
sql.push(this.tableName); sql.push(this.tableName);
sql.push("WHERE order_id = :orderId"); sql.push("WHERE invoice_id = :invoiceId");
sql.push("AND `status` = :status"); sql.push("AND `status` = :status");
let list = await this.customQuery(sql.join(" "), {orderId: orderId, status: status}); let list = await this.customQuery(sql.join(" "), {invoiceId: invoiceId, status: status});
if (!list || list.length == 0) { if (!list || list.length == 0) {
return null; return null;
} }
return list[0]; return list[0];
} }
async listByOrderIdsAndStatus(orderIds, statuses) { async listByInvoiceIdsAndStatus(invoiceIds, statuses) {
var result = {}; var result = {};
if (!orderIds || orderIds.length == 0 || !statuses || statuses.length == 0) { if (!invoiceIds || invoiceIds.length == 0 || !statuses || statuses.length == 0) {
return result; return result;
} }
let sql = []; let sql = [];
...@@ -44,21 +44,21 @@ class IInvoiceprocessDao extends Dao { ...@@ -44,21 +44,21 @@ class IInvoiceprocessDao extends Dao {
sql.push("*"); sql.push("*");
sql.push("FROM"); sql.push("FROM");
sql.push(this.tableName); sql.push(this.tableName);
sql.push("WHERE order_id IN (:orderIds)"); sql.push("WHERE invoice_id IN (:invoiceIds)");
sql.push("AND `status` IN (:statuses)"); sql.push("AND `status` IN (:statuses)");
return await this.customQuery(sql.join(" "), {orderIds: orderIds, statuses: statuses}); return await this.customQuery(sql.join(" "), {invoiceIds: invoiceIds, statuses: statuses});
} }
async mapByOrderIdsAndStatus(orderIds, statuses) { async mapByInvoiceIdsAndStatus(invoiceIds, statuses) {
var result = {}; var result = {};
let list = await this.listByOrderIdsAndStatus(orderIds, statuses); let list = await this.listByInvoiceIdsAndStatus(invoiceIds, statuses);
if (!list || list.length == 0) { if (!list || list.length == 0) {
return result; return result;
} }
for (let item of list) { for (let item of list) {
result[item.order_id + "_" + item.status] = item; result[item.invoice_id + "_" + item.status] = item;
} }
return result; return result;
} }
......
xggsve-invoice/app/base/service/impl/invoice/iinvoiceSve.js
...@@ -23,62 +23,10 @@ class IInvoiceService extends ServiceBase { ...@@ -23,62 +23,10 @@ class IInvoiceService extends ServiceBase {
* 发票申请 * 发票申请
* @param {*} params * @param {*} params
*/ */
async invoiceApply(params){ async invoiceApply(params) {
} }
//********************************************** 代码分隔 总统在上面写 *********************************************************** */
//**********************************************以下是旧版本************************************************************ */
/**
* 构建产品流程对象
* @param productPid
* @param chooseProductIds
* @returns {Promise<void>}
*/
async buildProcess(params) {
let productPid = params.productPid || 50010000;
// 查询产品流程
let productProcessList = await this.iproductprocessDao.byProductPid(productPid);
if (!productProcessList || productProcessList.length == 0) {
return [];
}
let invoiceProcessList = [];
// 批量查流程
let processMap = await this.iprocessDao.mapAll();
for (let productProcess of productProcessList) {
// 风还钻该处理每一个子项流程 变为 订单流程对象
let process = processMap[productProcess.process_id];
let nextArr = this.trim(productProcess.next_status).split(",");
let nextStatus = [];
for (let nextId of nextArr) {
nextId = Number(nextId || 0);
let nextObj = processMap[nextId];
if (!nextObj) {
continue;
}
nextStatus.push({ next_status: nextObj.status, next_name: nextObj.name });
}
let orderProcess = {
product_id: productPid,
name: process.name,
status: process.status,
func: productProcess.func,
next_status: JSON.stringify(nextStatus),
name1: productProcess.name1,
name2: productProcess.name2,
name3: productProcess.name3,
name4: productProcess.name4,
sort: productProcess.sort,
autoIncrement: true
};
invoiceProcessList.push(orderProcess);
}
return invoiceProcessList;
}
} }
module.exports = IInvoiceService; module.exports = IInvoiceService;
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment