orderList isDetail

center-order/app/base/service/impl/dbcorder/orderinfoSve.js

@@ -1039,8 +1039,13 @@ class OrderInfoService extends ServiceBase {
     var from = pageIndex == 1 ? 0 : Number((pageIndex - 1) * pageSize);
     var from = pageIndex == 1 ? 0 : Number((pageIndex - 1) * pageSize);
 
 
     var paramWhere = {};
     var paramWhere = {};
+
+    // var sql = "select `isSolution`,`orderNo`,`channelServiceNo`,`channelOrderNo`,`channelUserId`,`ownerUserId`,`payTime`,`quantity`,`serviceQuantity`,`orderStatusName`,`orderStatus`,`totalSum`,`payTotalSum`,`refundSum`,"
+    //   + " `invoiceApplyStatus`,`opNotes`,`channelItemCode`,`channelItemName`,`price`,priceDesc,priceTypeName,channelItemAppendName,`serviceItemCode`,`picUrl`,created_at from v_order where uapp_id=:uapp_id";
+    // 2020 0714 lin修改 关联交付表 查询交付信息，用来确认是否已确认方案
     var sql = "select `isSolution`,`orderNo`,`channelServiceNo`,`channelOrderNo`,`channelUserId`,`ownerUserId`,`payTime`,`quantity`,`serviceQuantity`,`orderStatusName`,`orderStatus`,`totalSum`,`payTotalSum`,`refundSum`,"
     var sql = "select `isSolution`,`orderNo`,`channelServiceNo`,`channelOrderNo`,`channelUserId`,`ownerUserId`,`payTime`,`quantity`,`serviceQuantity`,`orderStatusName`,`orderStatus`,`totalSum`,`payTotalSum`,`refundSum`,"
-      + " `invoiceApplyStatus`,`opNotes`,`channelItemCode`,`channelItemName`,`price`,priceDesc,priceTypeName,channelItemAppendName,`serviceItemCode`,`picUrl`,created_at from v_order where uapp_id=:uapp_id";
+      + " `invoiceApplyStatus`,`opNotes`,`channelItemCode`,`channelItemName`,`price`,priceDesc,priceTypeName,channelItemAppendName,`serviceItemCode`,`picUrl`,created_at,c_order_delivery.deliveryContent from v_order "
+      + " LEFT JOIN c_order_delivery ON v_order.orderNo = c_order_delivery.sourceOrderNo where v_order.uapp_id=:uapp_id";
     var sqlCount = "select count(1) as dataCount from v_order where uapp_id=:uapp_id";
     var sqlCount = "select count(1) as dataCount from v_order where uapp_id=:uapp_id";
 
 
     paramWhere.uapp_id = pobj.appInfo.uapp_id;
     paramWhere.uapp_id = pobj.appInfo.uapp_id;
@@ -1073,9 +1078,28 @@ class OrderInfoService extends ServiceBase {
       paramWhere.entTime = entTime;
       paramWhere.entTime = entTime;
     }
     }
 
 
-    sql += " order by id desc LIMIT " + pageSize + " OFFSET " + from;
+    // sql += " order by id desc LIMIT " + pageSize + " OFFSET " + from;
+    // 2020 0714 lin修改 关联交付表 查询交付信息，用来确认是否已确认方案
+    sql += " order by v_order.id desc LIMIT " + pageSize + " OFFSET " + from;
 
 
     var list = await this.customQuery(sql, paramWhere);
     var list = await this.customQuery(sql, paramWhere);
+    // 2020 0714 lin 新增 用来处理订单列表的进入详情权限
+    for(let i = 0;i < list.length;i++) {
+        // 如果没有交付信息跳出
+        if(!list[i]["deliveryContent"]){
+            list[i]["isDetail"] = 0;
+            delete list[i]["deliveryContent"];
+            continue;
+        }
+        // 如果交付信息状态不等于 待确认方案 || 方案不通过 判断为可进入详情
+        if(list[i]["deliveryContent"]["deliveryStatus"] != "dqrfa" && list[i]["deliveryContent"]["deliveryStatus"] != "fabtg") {
+            list[i]["isDetail"] = 1;
+            delete list[i]["deliveryContent"];
+            continue;
+        }
+        list[i]["isDetail"] = 0;
+        delete list[i]["deliveryContent"];
+    }
     var result = system.getResultSuccess(list);
     var result = system.getResultSuccess(list);
 
 
     var tmpResultCount = await this.customQuery(sqlCount, paramWhere);
     var tmpResultCount = await this.customQuery(sqlCount, paramWhere);