ucommune-back operate api

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

@@ -315,24 +315,36 @@ class OrderInfoService extends ServiceBase {
     result.data.deliveryFlowLog = await this.getOrderLogInfo(pobj, actionBody);
     result.data.deliveryFlowLog = await this.getOrderLogInfo(pobj, actionBody);
     // 订单金额相关
     // 订单金额相关
     result.data.orderDetail = await this.getOrderDetails(pobj, actionBody);
     result.data.orderDetail = await this.getOrderDetails(pobj, actionBody);
-    // 付款信息
-    var moneyJourneySql = "select accountTypeName from c_moneyjourney where sourceOrderNo=:sourceOrderNo";
-    var paramWhere = { sourceOrderNo: actionBody.orderNo };
-    var moneyJourneylist = await this.moneyJourneyDao.customQuery(moneyJourneySql,paramWhere);
-    if(moneyJourneylist.length == 0) {
-        result.data.accountTypeName = "其他";
-        return result;
-    }
     // 查询官方回执文件
     // 查询官方回执文件
     if(result.data.nclones.length != 0) {
     if(result.data.nclones.length != 0) {
+        // 循环商标类别
         for(let i = 0;i<result.data.nclones.length;i++) {
         for(let i = 0;i<result.data.nclones.length;i++) {
+            // 根据商标类别码 查询出 交付明细（c_delivery_official_flow）
             var list = await this.getOrderDeliveryFlowInfo(pobj, {sourceOrderNo: result.data.nclones[i]["tmRegistNum"]});
             var list = await this.getOrderDeliveryFlowInfo(pobj, {sourceOrderNo: result.data.nclones[i]["tmRegistNum"]});
             result.data.nclones[i]["DeliveryFlowInfo"] = [];
             result.data.nclones[i]["DeliveryFlowInfo"] = [];
+            // 循环查询出来的交付明细
             for(let j = 0;j < list.length;j++) {
             for(let j = 0;j < list.length;j++) {
-                result.data.nclones[i]["DeliveryFlowInfo"].push(list[j]["officialFlow"])
+                // 声明回执文件名字29471633-注册-PASSED.pdf
+                var uploadFileName = list[j]["officialFlow"][0]["uploadFileName"] ? list[j]["officialFlow"][0]["uploadFileName"] : "";
+                var returnReceiptUrl = list[j]["officialFlow"][0]["returnReceiptUrl"] ? list[j]["officialFlow"][0]["returnReceiptUrl"] : "";
+                // 切割去掉后缀名 29471633-注册-PASSED
+                uploadFileName = uploadFileName.split(".")[0];
+                result.data.nclones[i]["DeliveryFlowInfo"].push({
+                    uploadFileName:uploadFileName,
+                    returnReceiptUrl:returnReceiptUrl
+                })
             }
             }
         }
         }
     }
     }
+    // 付款信息
+    var moneyJourneySql = "select accountTypeName from c_moneyjourney where sourceOrderNo=:sourceOrderNo";
+    var paramWhere = { sourceOrderNo: actionBody.orderNo };
+    var moneyJourneylist = await this.moneyJourneyDao.customQuery(moneyJourneySql,paramWhere);
+    if(moneyJourneylist.length == 0) {
+        result.data.accountTypeName = "其他";
+        return result;
+    }
+    
     result.data.accountTypeName = moneyJourneylist[0]["accountTypeName"];
     result.data.accountTypeName = moneyJourneylist[0]["accountTypeName"];
     return result;
     return result;
   }
   }