dd

xgg-saas-platform/app/base/service/impl/common/deliverSve.js

@@ -13,7 +13,7 @@ class DeliverService extends ServiceBase {
   }
   }
 
 
   async all(params) {
   async all(params) {
-    var rs = await this.callms("common", "deliverAll", {});
+    var rs = await this.callms("common", "deliverAll", params);
     await this.doPercent(rs.data);
     await this.doPercent(rs.data);
     return rs;
     return rs;
   }
   }

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

@@ -41,7 +41,7 @@ class OrderService extends ServiceBase {
 
 
     if(params.audit_status == "20" && rs.status === 0 && params.ids && params.ids.length > 0) {
     if(params.audit_status == "20" && rs.status === 0 && params.ids && params.ids.length > 0) {
       for(let id of params.ids) {
       for(let id of params.ids) {
-        this.pushOrderToDeliver(id);
+        this.pushOrderToDeliver(id,params.deliver_id);
       }
       }
     }
     }
     return rs;
     return rs;
@@ -52,7 +52,7 @@ class OrderService extends ServiceBase {
    * @param id
    * @param id
    * @returns {Promise<void>}
    * @returns {Promise<void>}
    */
    */
-  async pushOrderToDeliver(id) {
+  async pushOrderToDeliver(id,deliver_id) {
     let order = await this.callms("order", "saasOrderInfo", {id: id}) || {};
     let order = await this.callms("order", "saasOrderInfo", {id: id}) || {};
     order = order.data;
     order = order.data;
     if (!order) {
     if (!order) {
@@ -71,7 +71,8 @@ class OrderService extends ServiceBase {
       guest_mail_addr:order.saasOrderDeliverInfo.deliver_addr|| "",
       guest_mail_addr:order.saasOrderDeliverInfo.deliver_addr|| "",
       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
     };
     };
 
 
     // 推送订单到交付平台
     // 推送订单到交付平台

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

@@ -200,13 +200,13 @@ class System {
         order: local + ":3103" + path,
         order: local + ":3103" + path,
 
 
         // 发票服务
         // 发票服务
-        invoice: local + ":3105" + path,
+        invoice: dev + ":3105" + path,
 
 
         // 用户服务
         // 用户服务
         uc: dev + ":3106" + path,
         uc: dev + ":3106" + path,
 
 
         // 交易
         // 交易
-        trade: local + ":3107" + path,
+        trade: dev + ":3107" + path,
       }
       }
     } else {
     } else {
       return {
       return {

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

@@ -91,8 +91,8 @@ var settings = {
   deliverSysApi: function () {
   deliverSysApi: function () {
     let domain = "";
     let domain = "";
     if (this.env == "dev") {
     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:3112";
     } else {
     } else {
       domain = "https://xggadmin.gongsibao.com";
       domain = "https://xggadmin.gongsibao.com";
     }
     }