Merge branch 'xggsve-order-dev' of gitlab.gongsibao.com:jiangyong/zhichan into xggsve-order-dev

xggsve-order/app/base/service/impl/order/iborderbaseSve.js

@@ -155,8 +155,15 @@ class IborderbaseService extends ServiceBase {
     try {
       let childSve = this.getService(params.productType);
       let page = await childSve.orderPage(params);
-      if(page && page.rows) {
-        await this.setBaseOrder(page.rows);
+      if(page && page.data && page.data.rows) {
+        await this.setBaseOrder(page.data.rows);
+      }
+      for(let item of page.data.rows){
+        if(item.baseInfo && item.baseInfo.productType!="1000"){
+          this.changeStatus(item.baseInfo,item);
+          this.changePayStatus(item.baseInfo,item);
+        }
+        
       }
       return page;
     } catch (error) {
@@ -164,6 +171,32 @@ class IborderbaseService extends ServiceBase {
     }
   }
 
+  changeStatus (baseInfo,orderInfo){
+    // 1000待处理 1010办理中 1020办理完成  2000已取消
+    if(baseInfo.status=="1000"){
+      orderInfo.ostatusName = "待处理";
+    }else if(baseInfo.status=="1010"){
+      orderInfo.ostatusName = "办理中";
+    }else if(baseInfo.status=="1020"){
+      orderInfo.ostatusName = "办理完成";
+    }else if(baseInfo.status=="2000"){
+      orderInfo.ostatusName = "已取消";
+    }else{
+      orderInfo.ostatusName = "";
+    }
+  }
+
+  changePayStatus (baseInfo,orderInfo){
+    //支付状态 10待支付 20已支付
+    if(baseInfo.payStatus=="10"){
+      orderInfo.payStatusName = "待支付";
+    }else if(baseInfo.payStatus=="20"){
+      orderInfo.payStatusName = "已支付";
+    }else{
+      orderInfo.payStatusName = "";
+    }
+  }
+
   /**
    * 企服通 推送支付信息接口
    * @param {*} params
@@ -257,7 +290,7 @@ class IborderbaseService extends ServiceBase {
     let map = await this.dao.findMapByIds(ids);
 
     for (var row of rows) {
-      row.baseInfo = map(row.id);
+      row.baseInfo = map[row.id];
     }
   }
 }