gsb

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

@@ -275,7 +275,7 @@ class InvoiceCtl extends CtlBase {
           batch_no: batch_no,
           batch_no: batch_no,
           apply_no: apply_no,
           apply_no: apply_no,
           fee_type: "10",
           fee_type: "10",
-          invoice_amount: Number(invoice.invoice_amount || 0),
+          invoice_amount: system.y2f(invoice.invoice_amount),
           invoice_type: this.trim(params.invoice_type),
           invoice_type: this.trim(params.invoice_type),
 
 
           from_name: bussinessmen.name,
           from_name: bussinessmen.name,
@@ -296,10 +296,10 @@ class InvoiceCtl extends CtlBase {
           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),
 
 
-          personal_invoice_tax: invoice.personal_invoice_tax || 0,
-          additional_tax: invoice.additional_tax || 0,
-          service_tax: invoice.service_tax || 0,
-          value_added_tax: invoice.value_added_tax || 0,
+          personal_invoice_tax: system.y2f(invoice.personal_invoice_tax),
+          additional_tax: system.y2f(invoice.additional_tax),
+          service_tax: system.y2f(invoice.service_tax),
+          value_added_tax: system.y2f(invoice.value_added_tax),
           unit: this.trim(invoice.unit),
           unit: this.trim(invoice.unit),
           quantity: this.trim(invoice.quantity),
           quantity: this.trim(invoice.quantity),
           price: this.trim(invoice.price),
           price: this.trim(invoice.price),

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

@@ -52,8 +52,11 @@ class SaasinvoiceService extends ServiceBase {
     }
     }
 
 
     for (let row of rows) {
     for (let row of rows) {
-      row.price = system.f2y(row.price);
       row.invoice_amount = system.f2y(row.invoice_amount);
       row.invoice_amount = system.f2y(row.invoice_amount);
+      row.personal_invoice_tax = system.f2y(row.personal_invoice_tax);
+      row.additional_tax = system.f2y(row.additional_tax);
+      row.value_added_tax = system.f2y(row.value_added_tax);
+      row.service_tax = system.f2y(row.service_tax);
     }
     }
   }
   }