ucommune-back operate api

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

@@ -273,18 +273,24 @@ class OrderInfoService extends ServiceBase {
     var list = await this.flowlogDao.getlogListBySourceOrderNo(actionBody.orderNo);
     var list = await this.flowlogDao.getlogListBySourceOrderNo(actionBody.orderNo);
     return list;
     return list;
   }
   }
-  async getOrderDetails(pobj, actionBody) {//获取订单详情信息
+  async getOrderDetails(pobj, actionBody) {//获取订单详情信息 2020 07 20 去掉产品快照serviceItemSnapshot
     var sql = "select `orderNo`,`channelServiceNo`,`channelOrderNo`,`channelUserId`,`ownerUserId`,`payTime`,`quantity`,`serviceQuantity`,`orderStatusName`,`orderStatus`,`totalSum`,`payTotalSum`,`refundSum`," +
     var sql = "select `orderNo`,`channelServiceNo`,`channelOrderNo`,`channelUserId`,`ownerUserId`,`payTime`,`quantity`,`serviceQuantity`,`orderStatusName`,`orderStatus`,`totalSum`,`payTotalSum`,`refundSum`," +
-      " `invoiceApplyStatus`,`opNotes`,`notes`,`channelItemCode`,`channelItemName`,`price`,priceDesc,priceTypeName,channelItemAppendName,`serviceItemCode`,`picUrl`,`serviceItemSnapshot`,`orderSnapshot`,`totalServiceCharge`,`totalPublicExpense`,`totalDiscounts`,created_at from " +
+      " `invoiceApplyStatus`,`opNotes`,`notes`,`channelItemCode`,`channelItemName`,`price`,priceDesc,priceTypeName,channelItemAppendName,`serviceItemCode`,`picUrl`,`orderSnapshot`,`totalServiceCharge`,`totalPublicExpense`,`totalDiscounts`,created_at from " +
       " v_order where uapp_id=:uapp_id and orderNo=:orderNo  LIMIT 1";
       " v_order where uapp_id=:uapp_id and orderNo=:orderNo  LIMIT 1";
     var paramWhere = { uapp_id: pobj.appInfo.uapp_id, orderNo: actionBody.orderNo };
     var paramWhere = { uapp_id: pobj.appInfo.uapp_id, orderNo: actionBody.orderNo };
     var list = await this.customQuery(sql, paramWhere);
     var list = await this.customQuery(sql, paramWhere);
     if (!list || list.length == 0) {
     if (!list || list.length == 0) {
       return system.getResult(null, "订单数据为空，30200");
       return system.getResult(null, "订单数据为空，30200");
     }
     }
-    var result = system.getResultSuccess(list[0]);
+    var result = system.getResult(list[0]);
     return result;
     return result;
   }
   }
+  async getOrderDeliveryFlowInfo(pobj, actionBody) {//获取订单交付流程信息
+    var sql = "select officialFlow from c_delivery_official_flow where sourceOrderNo=:sourceOrderNo";
+    var paramWhere = { sourceOrderNo: actionBody.sourceOrderNo };
+    var list = await this.customQuery(sql, paramWhere);
+    return list;
+  }
   // 交付单详情
   // 交付单详情
   async getOrderDelivery(pobj, actionBody) {
   async getOrderDelivery(pobj, actionBody) {
     var sql = "select * from c_order_delivery where sourceOrderNo=:sourceOrderNo";
     var sql = "select * from c_order_delivery where sourceOrderNo=:sourceOrderNo";
@@ -313,6 +319,20 @@ class OrderInfoService extends ServiceBase {
     var moneyJourneySql = "select accountTypeName from c_moneyjourney where sourceOrderNo=:sourceOrderNo";
     var moneyJourneySql = "select accountTypeName from c_moneyjourney where sourceOrderNo=:sourceOrderNo";
     var paramWhere = { sourceOrderNo: actionBody.orderNo };
     var paramWhere = { sourceOrderNo: actionBody.orderNo };
     var moneyJourneylist = await this.moneyJourneyDao.customQuery(moneyJourneySql,paramWhere);
     var moneyJourneylist = await this.moneyJourneyDao.customQuery(moneyJourneySql,paramWhere);
+    if(moneyJourneylist.length == 0) {
+        result.data.accountTypeName = "其他";
+        return result;
+    }
+    // 查询官方回执文件
+    if(result.data.nclones.length != 0) {
+        for(let i = 0;i<result.data.nclones.length;i++) {
+            var list = await this.getOrderDeliveryFlowInfo(pobj, {sourceOrderNo: result.data.nclones[i]["tmRegistNum"]});
+            result.data.nclones[i]["DeliveryFlowInfo"] = [];
+            for(let j = 0;j < list.length;j++) {
+                result.data.nclones[i]["DeliveryFlowInfo"].push(list[j]["officialFlow"])
+            }
+        }
+    }
     result.data.accountTypeName = moneyJourneylist[0]["accountTypeName"];
     result.data.accountTypeName = moneyJourneylist[0]["accountTypeName"];
     return result;
     return result;
   }
   }