gsb

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

@@ -12,7 +12,7 @@ class SaasinvoiceService extends ServiceBase {
   async platforminvoicePage(params) {
   async platforminvoicePage(params) {
     let rs = await this.callms("invoice", "platforminvoicePage", params);
     let rs = await this.callms("invoice", "platforminvoicePage", params);
     if (rs && rs.data && rs.data.rows) {
     if (rs && rs.data && rs.data.rows) {
-      this.transOrderField(rs.data.rows);
+      this.transField(rs.data.rows);
     }
     }
     return rs;
     return rs;
   }
   }
@@ -21,7 +21,7 @@ class SaasinvoiceService extends ServiceBase {
   async platforminvoiceapplyPage(params) {
   async platforminvoiceapplyPage(params) {
     let rs = await this.callms("invoice", "platforminvoiceapplyPage", params);
     let rs = await this.callms("invoice", "platforminvoiceapplyPage", params);
     if (rs && rs.data && rs.data.rows) {
     if (rs && rs.data && rs.data.rows) {
-      this.transOrderField(rs.data.rows);
+      this.transField(rs.data.rows);
     }
     }
     return rs;
     return rs;
   }
   }
@@ -46,13 +46,14 @@ class SaasinvoiceService extends ServiceBase {
     return rs;
     return rs;
   }
   }
 
 
-  transOrderField(rows) {
+  transField(rows) {
     if (!rows || rows.length == 0) {
     if (!rows || rows.length == 0) {
       return;
       return;
     }
     }
 
 
     for (let row of rows) {
     for (let row of rows) {
       row.price = system.f2y(row.price);
       row.price = system.f2y(row.price);
+      row.invoice_amount = system.f2y(row.invoice_amount);
     }
     }
   }
   }
 
 
@@ -132,8 +133,9 @@ class SaasinvoiceService extends ServiceBase {
       "personal_invoice_tax": invoice.personal_invoice_tax || 0,
       "personal_invoice_tax": invoice.personal_invoice_tax || 0,
       "additional_tax": invoice.additional_tax || 0,
       "additional_tax": invoice.additional_tax || 0,
       "value_added_tax": invoice.value_added_tax || 0,
       "value_added_tax": invoice.value_added_tax || 0,
-      "channel_id": this.DEFAULT_CHANNEL_ID
-    }
+      "channel_id": this.DEFAULT_CHANNEL_ID,
+      "saas_deliver_api": settings.outApi().deliverNotifyApi
+  }
 
 
     let url = settings.deliverSysApi().pushInvoiceToDeliver;
     let url = settings.deliverSysApi().pushInvoiceToDeliver;
     let res = await axios({
     let res = await axios({