d

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

@@ -24,9 +24,39 @@ class ChannelCtl extends CtlBase {
     }
     }
   }
   }
 
 
+  /**
+   * fn:商户系统订单列表
+   * @param params
+   * @param pobj2
+   * @param req
+   * @returns {Promise<{msg: string, data: (*|null), bizmsg: string, status: number}|{msg: string, data, bizmsg: (*|string), status: number}|*>}
+   */
   async page(params, pobj2, req) {
   async page(params, pobj2, req) {
     try {
     try {
-      return await this.orderSve.page(params);
+      let listRes =  await this.orderSve.page(params);
+      if (listRes.status != 0) {
+        return system.getResult(null, `系统错误`);
+      }
+      let source_nos = [];
+      for (let item of listRes.data.rows) {
+        source_nos.push(item.id);
+      }
+      if(source_nos.length==0){
+        return system.getResult(null, `暂无数据`);
+      }
+      let res =await this.orderSve.queryOrderStatusBySourceNo({source_nos:source_nos});
+      if(res.status!=0){
+        return res;
+      }
+      let StatusMap = res.data;
+      for(let item of listRes.data.rows){
+        if(StatusMap[item.id]){
+          item.handle_name = StatusMap[item.id]['name3'] || "处理中";
+        }else{
+          item.handle_name ="处理中";
+        }
+      }
+      return listRes;
     } catch (error) {
     } catch (error) {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
     }

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

 const system = require("../../../system");
 const system = require("../../../system");
 const ServiceBase = require("../../svems.base")
 const ServiceBase = require("../../svems.base")
 const settings = require("../../../../config/settings")
 const settings = require("../../../../config/settings")
+const axios = require("axios");
 class OrderService extends ServiceBase {
 class OrderService extends ServiceBase {
   constructor() {
   constructor() {
     super();
     super();
@@ -26,6 +27,11 @@ class OrderService extends ServiceBase {
     return rs;
     return rs;
   }
   }
 
 
+  /**
+   * fn：商户系统
+   * @param params
+   * @returns {Promise<{msg: string, data, bizmsg: *|string, status: number}|*|undefined>}
+   */
   async page(params) {
   async page(params) {
     let rs = await this.callms("order", "saasOrderPage", params);
     let rs = await this.callms("order", "saasOrderPage", params);
     if (rs && rs.data && rs.data.rows) {
     if (rs && rs.data && rs.data.rows) {
@@ -71,5 +77,29 @@ class OrderService extends ServiceBase {
     return rs;
     return rs;
   }
   }
 
 
+  /**
+   * fn:根据订单来源查询状态
+   * @param params
+   * @returns {Promise<{msg: string, data, bizmsg: *|string, status: number}|any|undefined>}
+   */
+  async queryOrderStatusBySourceNo(params){
+    try{
+      let res = await axios({
+        method: 'post',
+        url: settings.deliverSysApi().queryOrderStatusBySourceNo,
+        data: params
+      });
+      console.log(res.data);
+      if(res.status == 200 && res.data && res.data.status == 0 && res.data.data) {
+        return res.data;
+      }
+      console.log(`xgg-saas-platform->orderSve->queryOrderStatusBySourceNo 请求结果` + JSON.stringify(res));
+      return system.getResult(null, `系统错误`);
+    }catch (e) {
+      console.log(e);
+      return system.getResult(null, `系统错误`);
+    }
+  }
+
 }
 }
 module.exports = OrderService;
 module.exports = OrderService;
\ No newline at end of file

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

@@ -194,7 +194,7 @@ class System {
 				merchant: dev + ":3101" + path,
 				merchant: dev + ":3101" + path,
 
 
 				// 订单服务
 				// 订单服务
-				order: dev + ":3103" + path,
+				order: local + ":3103" + path,
 
 
 				// 发票服务
 				// 发票服务
 				invoice: dev + ":3105" + path,
 				invoice: dev + ":3105" + path,

xgg-saas-merchant/app/base/wxapplet/impl/merchantApplet.js

@@ -231,6 +231,25 @@ class MerchantApplet extends AppletBase {
 
 
       let page = await this.orderSve.page(params);
       let page = await this.orderSve.page(params);
       if (page.status === 0) {
       if (page.status === 0) {
+        let source_nos = [];
+        for (let item of page.data.rows) {
+          source_nos.push(item.id);
+        }
+        if(source_nos.length==0){
+          return system.getResult(null, `暂无数据`);
+        }
+        let res =await this.orderSve.queryOrderStatusBySourceNo({source_nos:source_nos});
+        if(res.status!=0){
+          return res;
+        }
+        let StatusMap = res.data;
+        for(let item of page.data.rows){
+          if(StatusMap[item.id]){
+            item.handle_name = StatusMap[item.id]['name3'] || "处理中";
+          }else{
+            item.handle_name ="处理中";
+          }
+        }
         return this.returnSuccess(page.data);
         return this.returnSuccess(page.data);
       } else {
       } else {
         return this.returnFail(page.msg);
         return this.returnFail(page.msg);

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

@@ -133,11 +133,15 @@ 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://39.107.234.14:3012";
+      // orderDomain= "http://39.107.234.14:3012";
+      orderDomain= "http://127.0.0.1:3012";
     } else {
     } else {
       domain = "https://xggadmin.gongsibao.com";
       domain = "https://xggadmin.gongsibao.com";
     }
     }
     return {
     return {
+      // 根据订单来源查询状态
+      queryOrderStatusBySourceNo: orderDomain + "/web/order/orderCtl/queryOrderStatusBySourceNo",
       //发票是试算
       //发票是试算
       calcInvoice: domain + "/web/invoice/invoiceCtl/calcInvoice",
       calcInvoice: domain + "/web/invoice/invoiceCtl/calcInvoice",
     }
     }