ddg

xgg-saas-platform/app/base/controller/impl/saas/invoiceCtl.js

@@ -306,7 +306,7 @@ class InvoiceCtl extends CtlBase {
           mail_addr: this.trim(params.mail_addr),
           mail_addr: this.trim(params.mail_addr),
           mail_mobile: this.trim(params.mail_mobile),
           mail_mobile: this.trim(params.mail_mobile),
           mail_to: this.trim(params.mail_to),
           mail_to: this.trim(params.mail_to),
-          data_ids: this.trim(params.data_ids),        // TODO 总统测试
+          data_ids: this.trim(invoice.data_ids),        // TODO 总统测试
 
 
           personal_invoice_tax: system.y2f(invoice.personal_invoice_tax),
           personal_invoice_tax: system.y2f(invoice.personal_invoice_tax),
           additional_tax: system.y2f(invoice.additional_tax),
           additional_tax: system.y2f(invoice.additional_tax),

xgg-saas-platform/app/base/service/impl/saas/saasinvoiceSve.js

@@ -194,9 +194,13 @@ class SaasinvoiceService extends ServiceBase {
       if (saasInvoiceApply.fee_type == "00") { //个体户注册订单
       if (saasInvoiceApply.fee_type == "00") { //个体户注册订单
         tradOrder = [];
         tradOrder = [];
       } else { //查询流水
       } else { //查询流水
+        if(saasInvoiceApply.data_ids ){
+          saasInvoiceApply.data_ids = saasInvoiceApply.data_ids.split(',');
+        }
         let tradOrderRes =await this.callms("trade", "invoiceTrade", {
         let tradOrderRes =await this.callms("trade", "invoiceTrade", {
           id: saasInvoiceApply.id,
           id: saasInvoiceApply.id,
-          order_type: saasInvoiceApply.fee_type
+          order_type: saasInvoiceApply.fee_type,
+          data_ids:saasInvoiceApply.data_ids || []
         }) || {};
         }) || {};
         if (tradOrderRes.status == 0) {
         if (tradOrderRes.status == 0) {
           tradOrder = tradOrderRes.data;
           tradOrder = tradOrderRes.data;

xgg-saas-platform/app/base/system.js

@@ -200,7 +200,7 @@ class System {
         order: dev + ":3103" + path,
         order: dev + ":3103" + path,
 
 
         // 发票服务
         // 发票服务
-        invoice: dev + ":3105" + path,
+        invoice: local + ":3105" + path,
 
 
         // 用户服务
         // 用户服务
         uc: dev + ":3106" + path,
         uc: dev + ":3106" + path,