d

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

@@ -72,7 +72,8 @@ class OrderService extends ServiceBase {
       guest_mail_to:order.saasOrderDeliverInfo.deliver_man || "",
       guest_mail_to:order.saasOrderDeliverInfo.deliver_man || "",
       guest_mail_mobile:order.saasOrderDeliverInfo.deliver_mobile || "",
       guest_mail_mobile:order.saasOrderDeliverInfo.deliver_mobile || "",
       saas_id:order.saas_id,
       saas_id:order.saas_id,
-      deliver_id:deliver_id
+      deliver_id:deliver_id,
+      price:order.price || 0
     };
     };
 
 
     // 推送订单到交付平台
     // 推送订单到交付平台

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

@@ -191,7 +191,7 @@ class System {
       let dev = "http://39.107.234.14";
       let dev = "http://39.107.234.14";
       return {
       return {
         // 公共服务
         // 公共服务
-        common: local + ":3102" + path,
+        common: dev + ":3102" + path,
 
 
         // 商户服务
         // 商户服务
         merchant: dev + ":3101" + path,
         merchant: dev + ":3101" + path,

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

@@ -120,8 +120,10 @@ var settings = {
     };
     };
   },
   },
   deliverSysApi: function () {
   deliverSysApi: function () {
-    let domain = "";
+    let domain = "",orderDomain = "";
     if (this.env == "dev") {
     if (this.env == "dev") {
+      orderDomain= "http://39.107.234.14:3012";
+      // orderDomain= "http://127.0.0.1:3012";
       domain = "http://39.107.234.14:3002";
       domain = "http://39.107.234.14:3002";
       // domain = "http://127.0.0.1:3112";
       // domain = "http://127.0.0.1:3112";
     } else {
     } else {
@@ -129,7 +131,7 @@ var settings = {
     }
     }
     return {
     return {
       // 推送订单s
       // 推送订单s
-      orderPushApi: domain + "/web/order/orderCtl/addSourceOrder",
+      orderPushApi: orderDomain + "/web/order/orderCtl/addSourceOrder",
       //发票是试算
       //发票是试算
       calcInvoice: domain + "/web/invoice/invoiceCtl/calcInvoice",
       calcInvoice: domain + "/web/invoice/invoiceCtl/calcInvoice",
       //推送发票申请
       //推送发票申请