dd

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

@@ -174,7 +174,7 @@ class InvoiceCtl extends CtlBase {
   // 功能1开票（商户交易  也是线下交易）
   // 功能1开票（商户交易  也是线下交易）
   async apply20(params, pobj2, req) {
   async apply20(params, pobj2, req) {
     try {
     try {
-      validation.check(params, "invoice_type", {name: "发票类型", is_require: true, dics: ['00', "10", "20"]});
+      validation.check(params, "invoice_type", {name: "发票类型", is_require: true, dics: ['30', "10", "20"]});
       validation.check(params, "pay_voucher", {name: "支付凭证", is_require: true});
       validation.check(params, "pay_voucher", {name: "支付凭证", is_require: true});
       validation.check(params, "invoiceList", {name: "开票信息", arr_require: true});
       validation.check(params, "invoiceList", {name: "开票信息", arr_require: true});
 
 

xgg-saas-merchant/app/base/service/impl/saas/invoiceSve.js

@@ -72,7 +72,8 @@ class InvoiceService extends ServiceBase {
                 });
                 });
                 if (tradOrderRes.status == 0) {
                 if (tradOrderRes.status == 0) {
                     tradOrder = tradOrderRes.data;
                     tradOrder = tradOrderRes.data;
-                }
+                };
+                saasInvoiceApply.service_tax=system.f2y(saasInvoiceApply.service_tax);
             }
             }
             saasInvoiceApply.tradOrder = tradOrder;
             saasInvoiceApply.tradOrder = tradOrder;
             return system.getResult(saasInvoiceApply);
             return system.getResult(saasInvoiceApply);