d

xgg-saas-merchant/app/base/api/impl/h5/merchantApi.js

@@ -275,11 +275,33 @@ class TestAPI extends APIBase {
                 merchant_id: loginUser.data.saas_merchant_id,
                 merchant_id: loginUser.data.saas_merchant_id,
             }
             }
 
 
-            let page = await this.orderSve.page(params);
-            if (page.status === 0) {
-                return this.returnSuccess(page.data);
+            let listRes = await this.orderSve.page(params);
+            if (listRes.status === 0) {
+                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 this.returnSuccess(listRes.data);
             } else {
             } else {
-                return this.returnFail(page.msg);
+                return this.returnFail(listRes.msg);
             }
             }
         } catch (e) {
         } catch (e) {
             console.log(e.stack);
             console.log(e.stack);

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

@@ -53,7 +53,7 @@ class ChannelCtl extends CtlBase {
         if(StatusMap[item.id]){
         if(StatusMap[item.id]){
           item.handle_name = StatusMap[item.id]['name3'] || "处理中";
           item.handle_name = StatusMap[item.id]['name3'] || "处理中";
         }else{
         }else{
-          item.handle_name ="处理中";
+          item.handle_name ="订单处理中";
         }
         }
       }
       }
       return listRes;
       return listRes;