Merge branch 'xgg-saas-platform' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-saas-platform

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

@@ -146,6 +146,7 @@ class InvoiceCtl extends CtlBase {
         "name": businessmen.name,
         "credit_code": creditCode,
         "is_bank": businessmen.isBank,
+        "is_bank_name": businessmen.isBank ? "已开户" : "未开户",
         "invoice_amount": amount,
         "personal_invoice_tax": 0,
         "additional_tax": 0,
@@ -187,20 +188,20 @@ class InvoiceCtl extends CtlBase {
         additional_tax_total = additional_tax_total + Number(invoiceCalc.additional_tax);
         personal_invoice_tax_total = personal_invoice_tax_total + Number(invoiceCalc.personal_invoice_tax);
         value_added_tax_total = value_added_tax_total + Number(invoiceCalc.value_added_tax);
-        service_tax_total = service_tax_total + Number(invoiceCalc.service_tax);
+        service_tax_total = service_tax_total + Number(invoiceCalc.service_amount);
 
-        invoice.personal_invoice_tax = Number(invoiceCalc.personal_invoice_tax);
-        invoice.additional_tax = Number(invoiceCalc.additional_tax);
-        invoice.service_tax = Number(invoiceCalc.service_tax);
-        invoice.value_added_tax = Number(invoiceCalc.value_added_tax);
+        invoice.personal_invoice_tax = system.toFloat(Number(invoiceCalc.personal_invoice_tax));
+        invoice.additional_tax = system.toFloat(Number(invoiceCalc.additional_tax));
+        invoice.service_tax = system.toFloat(Number(invoiceCalc.service_amount));
+        invoice.value_added_tax = system.toFloat(Number(invoiceCalc.value_added_tax));
       }
 
       return system.getResultSuccess({
         tax: {
-          additional_tax_total: additional_tax_total,
-          personal_invoice_tax_total: personal_invoice_tax_total,
-          value_added_tax_total: value_added_tax_total,
-          service_tax_total: service_tax_total,
+          additional_tax_total: system.toFloat(additional_tax_total),
+          personal_invoice_tax_total: system.toFloat(personal_invoice_tax_total),
+          value_added_tax_total: system.toFloat(value_added_tax_total),
+          service_tax_total: system.toFloat(service_tax_total),
         },
         invoiceList: invoiceList
       });

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

@@ -194,13 +194,13 @@ class System {
         common: dev + ":3102" + path,
 
         // 商户服务
-        merchant: local + ":3101" + path,
+        merchant: dev + ":3101" + path,
 
         // 订单服务
         order: dev + ":3103" + path,
 
         // 发票服务
-        invoice: local + ":3105" + path,
+        invoice: dev + ":3105" + path,
 
         // 用户服务
         uc: dev + ":3106" + path,

xgg-saas-platform/app/config/settings.js

@@ -90,8 +90,8 @@ var settings = {
   deliverSysApi: function () {
     let domain = "";
     if (this.env == "dev") {
-      // domain = "http://39.107.234.14:3002";
-      domain = "http://127.0.0.1:3002";
+      domain = "http://39.107.234.14:3002";
+      // domain = "http://127.0.0.1:3002";
     } else {
       domain = "https://xggadmin.gongsibao.com";
     }
@@ -99,7 +99,7 @@ var settings = {
       // 推送订单s
       orderPushApi: domain + "/web/order/orderCtl/addSourceOrder",
       //发票是试算
-      calcInvoice: domain+"/web/invoice/invoiceCtl/calcInvoice"
+      calcInvoice: domain + "/web/invoice/invoiceCtl/calcInvoice"
     }
   },
   paasUrl: function () {