tmconfirm

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

@@ -1215,14 +1215,14 @@ class OrderInfoService extends ServiceBase {
     }
     }
     //获取交付单信息
     //获取交付单信息
     var orderdeliveryRes = await this.getOrderDelivery(orderNo);
     var orderdeliveryRes = await this.getOrderDelivery(orderNo);
-    if (!orderdeliveryRes || !orderdeliveryRes.length<1) {
+    if (!orderdeliveryRes || orderdeliveryRes.length<1) {
       return system.getResultFail(-104, "未知订单交付信息");
       return system.getResultFail(-104, "未知订单交付信息");
     }
     }
-    var orderdelivery = orderdelivery[0];
+    var orderdelivery = orderdeliveryRes[0];
     var deliveryContent = orderdelivery.deliveryContent;
     var deliveryContent = orderdelivery.deliveryContent;
-    if (!deliveryContent || !deliveryContent.deliveryStatus || deliveryContent.deliveryStatus != "dqrfa") {
-      return system.getResultFail(-105, "方案确认失败，该方案交付状态为" + ordertmproduct.deliveryStatusName);
-    }
+    // if (!deliveryContent || !deliveryContent.deliveryStatus || deliveryContent.deliveryStatus != "dqrfa") {
+    //   return system.getResultFail(-105, "方案确认失败，方案交付状态错误");
+    // }
     if(!deliveryContent.deliveryStatusList){
     if(!deliveryContent.deliveryStatusList){
       deliveryContent.deliveryStatusList = [];
       deliveryContent.deliveryStatusList = [];
     }
     }
@@ -1236,6 +1236,9 @@ class OrderInfoService extends ServiceBase {
       var orderInfoObj = {
       var orderInfoObj = {
         id:orderinfo.id
         id:orderinfo.id
       };
       };
+      if(ab.notes){
+        orderInfoObj["opNotes"]=ab.notes;
+      }
       if (isConfirm == "0") {
       if (isConfirm == "0") {
         if (!ab.notes) {
         if (!ab.notes) {
           return system.getResultFail(-106, "方案确认失败，不通过原因不能为空");
           return system.getResultFail(-106, "方案确认失败，不通过原因不能为空");
@@ -1254,7 +1257,7 @@ class OrderInfoService extends ServiceBase {
       if (isConfirm == "1") {
       if (isConfirm == "1") {
         deliveryContent["deliveryStatus"] = "dsh";
         deliveryContent["deliveryStatus"] = "dsh";
         deliveryContent["deliveryStatusName"] = "待审核";
         deliveryContent["deliveryStatusName"] = "待审核";
-        deliveryContent["opNotes"] = obj.notes || "";
+        deliveryContent["opNotes"] = ab.notes || "";
         orderLog["opContent"] = "商标方案确认通过";
         orderLog["opContent"] = "商标方案确认通过";
         deliveryContent.deliveryStatusList.push({
         deliveryContent.deliveryStatusList.push({
           deliveryStatus:"dsh",
           deliveryStatus:"dsh",
@@ -1267,7 +1270,13 @@ class OrderInfoService extends ServiceBase {
       self.putOrderDelivery(deliveryContent,orderNo);//修改订单交付信息
       self.putOrderDelivery(deliveryContent,orderNo);//修改订单交付信息
       await self.dao.update(orderInfoObj, t);//修改订单信息
       await self.dao.update(orderInfoObj, t);//修改订单信息
       await self.flowlogDao.create(orderLog, t);//添加流程信息
       await self.flowlogDao.create(orderLog, t);//添加流程信息
-      return system.getResultSuccess();
+      var pushObj = {//推送参数
+        serviceNo:deliveryContent.serviceNo,
+        isConfirm:isConfirm,
+        channelCode:deliveryContent.channelCode,
+        notes:ab.notes || ""
+      };
+      return system.getResultSuccess(pushObj);
     })
     })
   }
   }