tj

center-order/app/base/db/impl/dbcorder/ordercontactsDao.js

@@ -4,5 +4,20 @@ class OrderContactsDao extends Dao {
   constructor() {
   constructor() {
     super(Dao.getModelName(OrderContactsDao));
     super(Dao.getModelName(OrderContactsDao));
   }
   }
+  async getItemByOrderNo(orderNo, uapp_id) {
+    return await this.model.findOne({
+      where: {
+        sourceOrderNo: orderNo
+      },
+      attributes: [
+        "id",
+        "contactName",
+        "mobile",
+        "tel",
+        "email",
+        "fax"],
+      raw: true
+    });
+  }
 }
 }
 module.exports = OrderContactsDao;
 module.exports = OrderContactsDao;

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

@@ -220,20 +220,22 @@ class OrderInfoService extends ServiceBase {
         nclThree: nclThree,
         nclThree: nclThree,
         nclCount: nclThree.length,
         nclCount: nclThree.length,
         nclPublicExpense: Number(price_item.price) * nclThree.length,
         nclPublicExpense: Number(price_item.price) * nclThree.length,
-        deliveryStatus: deliveryStatus,//商标交付状态
-        deliveryStatusName: deliveryStatusName,
+        tmStatus: deliveryStatus,//商标交付状态
+        tmStatusName: deliveryStatusName,
         submitTime: "",
         submitTime: "",
         deliveryType: pobj.appInfo.delivery_type,//应用数据操作类型：00独立，10全委托
         deliveryType: pobj.appInfo.delivery_type,//应用数据操作类型：00独立，10全委托
         tbCode: await self.getBusUid("tb" + pobj.appInfo.uapp_id)//提报号(自动生成)
         tbCode: await self.getBusUid("tb" + pobj.appInfo.uapp_id)//提报号(自动生成)
       }
       }
       nclList.push(tempNclones);
       nclList.push(tempNclones);
     }
     }
+    pobj.actionBody.deliveryData.deliveryStatus = deliveryStatus;
+    pobj.actionBody.deliveryData.deliveryStatusName = deliveryStatusName;
     pobj.actionBody.deliveryData.nclList = nclList;
     pobj.actionBody.deliveryData.nclList = nclList;
     delete pobj.actionBody.deliveryData["nclones"];
     delete pobj.actionBody.deliveryData["nclones"];
     return system.getResultSuccess();
     return system.getResultSuccess();
   }
   }
 
 
-   //   caseService   拟开展服务项目  多 必
+  //   caseService   拟开展服务项目  多 必
   // caseCustomerType   目标用户   多 必
   // caseCustomerType   目标用户   多 必
   // caseProfitType    盈利模式   多 必
   // caseProfitType    盈利模式   多 必
   // caseApprovalProgram  需专项审批的项目  多 
   // caseApprovalProgram  需专项审批的项目  多 
@@ -537,24 +539,31 @@ class OrderInfoService extends ServiceBase {
     var sql = "select * from c_order_delivery where sourceOrderNo=:sourceOrderNo";
     var sql = "select * from c_order_delivery where sourceOrderNo=:sourceOrderNo";
     var paramWhere = { sourceOrderNo: actionBody.orderNo };
     var paramWhere = { sourceOrderNo: actionBody.orderNo };
     var list = await this.customQuery(sql, paramWhere);
     var list = await this.customQuery(sql, paramWhere);
+    var result = system.getResultSuccess();
     if (list && list.length > 0) {
     if (list && list.length > 0) {
       if (list[0].deliveryContent) {
       if (list[0].deliveryContent) {
-        return system.getResultSuccess(list[0].deliveryContent);
+        result.data = list[0].deliveryContent;
       }
       }
     }
     }
-    return system.getResultSuccess();
+    result.data.orderContact = null;
+    var item = await this.ordercontactsDao.getItemByOrderNo(actionBody.orderNo);
+    if (item) {
+      result.data.orderContact = item;
+    }
+    return result;
   }
   }
 
 
   async getOrderDeliveryFlowInfo(pobj, actionBody) {//获取订单交付流程信息
   async getOrderDeliveryFlowInfo(pobj, actionBody) {//获取订单交付流程信息
     var sql = "select * from c_delivery_official_flow where sourceOrderNo=:sourceOrderNo";
     var sql = "select * from c_delivery_official_flow where sourceOrderNo=:sourceOrderNo";
     var paramWhere = { sourceOrderNo: actionBody.sourceOrderNo };
     var paramWhere = { sourceOrderNo: actionBody.sourceOrderNo };
     var list = await this.customQuery(sql, paramWhere);
     var list = await this.customQuery(sql, paramWhere);
+    var result = system.getResultSuccess();
     if (list && list.length > 0) {
     if (list && list.length > 0) {
       if (list[0].officialFlow) {
       if (list[0].officialFlow) {
-        return system.getResultSuccess(list[0].officialFlow);
+        result.data = list[0].officialFlow;
       }
       }
     }
     }
-    return system.getResultSuccess();
+    return result;
   }
   }
   async getOrderDeliveryFlowList(pobj, actionBody) {//获取订单交付流程列表信息
   async getOrderDeliveryFlowList(pobj, actionBody) {//获取订单交付流程列表信息
     var sql = "select * from c_delivery_official_flow where sourceOrderNo IN(:sourceOrderNo)";
     var sql = "select * from c_delivery_official_flow where sourceOrderNo IN(:sourceOrderNo)";