gsb

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

@@ -92,7 +92,7 @@ class InvoiceCtl extends CtlBase {
       // apply = apply.data;
       // apply = apply.data;
 
 
       let result = await this.buildTradeInvoice(params);
       let result = await this.buildTradeInvoice(params);
-      return system.getResultSuccess(result);
+      return result;
     } catch (error) {
     } catch (error) {
       let msg = error.message;
       let msg = error.message;
       if (msg.startsWith("bpo-validation-error:")) {
       if (msg.startsWith("bpo-validation-error:")) {
@@ -192,7 +192,7 @@ class InvoiceCtl extends CtlBase {
       invoice.value_added_tax = Number(invoiceCalc.value_added_tax);
       invoice.value_added_tax = Number(invoiceCalc.value_added_tax);
     }
     }
 
 
-    return {
+    return system.getResultSuccess({
       tax: {
       tax: {
         additional_tax_total: additional_tax_total,
         additional_tax_total: additional_tax_total,
         personal_invoice_tax_total: personal_invoice_tax_total,
         personal_invoice_tax_total: personal_invoice_tax_total,
@@ -200,7 +200,7 @@ class InvoiceCtl extends CtlBase {
         service_tax_total: service_tax_total,
         service_tax_total: service_tax_total,
       },
       },
       invoiceList: invoiceList
       invoiceList: invoiceList
-    }
+    })
   }
   }
 
 
   async platformInvoiceApply(params, pobj2, req) {
   async platformInvoiceApply(params, pobj2, req) {

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

@@ -194,10 +194,10 @@ class System {
         common: dev + ":3102" + path,
         common: dev + ":3102" + path,
 
 
         // 商户服务
         // 商户服务
-        merchant: dev + ":3101" + path,
+        merchant: local + ":3101" + path,
 
 
         // 订单服务
         // 订单服务
-        order: local + ":3103" + path,
+        order: dev + ":3103" + path,
 
 
         // 发票服务
         // 发票服务
         invoice: local + ":3105" + path,
         invoice: local + ":3105" + path,
@@ -206,7 +206,7 @@ class System {
         uc: dev + ":3106" + path,
         uc: dev + ":3106" + path,
 
 
         // 交易
         // 交易
-        trade: local + ":3107" + path,
+        trade: dev + ":3107" + path,
       }
       }
     } else {
     } else {
       return {
       return {