Commit 90508b49 by 王昆

gsb

parent b29a8213
...@@ -66,7 +66,7 @@ class IInvoiceService extends ServiceBase { ...@@ -66,7 +66,7 @@ class IInvoiceService extends ServiceBase {
_invoice.personal_invoice_tax = this.trim(params.personal_invoice_tax) || 0 ; _invoice.personal_invoice_tax = this.trim(params.personal_invoice_tax) || 0 ;
_invoice.additional_tax = this.trim(params.additional_tax) || 0 ; _invoice.additional_tax = this.trim(params.additional_tax) || 0 ;
_invoice.value_added_tax = this.trim(params.value_added_tax) || 0 ; _invoice.value_added_tax = this.trim(params.value_added_tax) || 0 ;
_invoice.product_id = this.trim(params.product_id) || 1 ; _invoice.product_id = params.product_id || 50010000;
if(!params.merchant_name){ if(!params.merchant_name){
return system.getResult(null,`购买方名称不能为空`); return system.getResult(null,`购买方名称不能为空`);
} }
...@@ -128,7 +128,14 @@ class IInvoiceService extends ServiceBase { ...@@ -128,7 +128,14 @@ class IInvoiceService extends ServiceBase {
_invoice.mail_addr = this.trim(params.mail_addr) || ""; _invoice.mail_addr = this.trim(params.mail_addr) || "";
try { try {
await this.dao.create(_invoice); _invoice = await this.dao.create(_invoice);
let processList = await this.buildProcess(_invoice.product_id) || [];
for(let process of processList) {
process.invoice_id = _invoice.id;
}
await this.iinvoiceprocessDao.model.bulkCreate(processList);
return system.getResult(`success`); return system.getResult(`success`);
} catch (error) { } catch (error) {
console.log(error); console.log(error);
...@@ -227,8 +234,8 @@ class IInvoiceService extends ServiceBase { ...@@ -227,8 +234,8 @@ class IInvoiceService extends ServiceBase {
* @param chooseProductIds * @param chooseProductIds
* @returns {Promise<void>} * @returns {Promise<void>}
*/ */
async buildProcess(params) { async buildProcess(productPid) {
let productPid = params.productPid || 50010000; productPid = productPid || 50010000;
// 查询产品流程 // 查询产品流程
let productProcessList = await this.iproductprocessDao.byProductPid(productPid); let productProcessList = await this.iproductprocessDao.byProductPid(productPid);
if (!productProcessList || productProcessList.length == 0) { if (!productProcessList || productProcessList.length == 0) {
...@@ -269,7 +276,6 @@ class IInvoiceService extends ServiceBase { ...@@ -269,7 +276,6 @@ class IInvoiceService extends ServiceBase {
invoiceProcessList.push(orderProcess); invoiceProcessList.push(orderProcess);
} }
// await this.iinvoiceprocessDao.model.bulkCreate(invoiceProcessList);
return invoiceProcessList; return invoiceProcessList;
} }
......
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