tmconfirm

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

@@ -38,7 +38,8 @@ class InternalCallsNotifyService {
       if(orderdeliveryRes && orderdeliveryRes.length>0){
       if(orderdeliveryRes && orderdeliveryRes.length>0){
         return system.getResult(null,"保存商标订单交付信息失败，存在重复交付信息，不能重复提交，10300");
         return system.getResult(null,"保存商标订单交付信息失败，存在重复交付信息，不能重复提交，10300");
       }
       }
-      await this.addOrderDelivery(deliveryData,deliveryData.sourceOrderNo);
+      this.addOrderDelivery(deliveryData,deliveryData.sourceOrderNo);
+      await this.orderinfoDao.model.update({isSolution:1}, { where: { orderNo: pobj.sourceOrderNo }});
       return system.getResultSuccess();
       return system.getResultSuccess();
     }else{
     }else{
       return checkRes;
       return checkRes;
@@ -56,6 +57,7 @@ class InternalCallsNotifyService {
       var orderdelivery = orderdeliveryRes[0];
       var orderdelivery = orderdeliveryRes[0];
       var deliveryData = await this.packagingTmDeliveryData(pobj,orderdelivery.deliveryContent);
       var deliveryData = await this.packagingTmDeliveryData(pobj,orderdelivery.deliveryContent);
       this.putOrderDelivery(deliveryData,deliveryData.sourceOrderNo,deliveryData.serviceNo);
       this.putOrderDelivery(deliveryData,deliveryData.sourceOrderNo,deliveryData.serviceNo);
+      await this.orderinfoDao.model.update({isSolution:1}, { where: { orderNo: pobj.sourceOrderNo }});
       return system.getResultSuccess();
       return system.getResultSuccess();
     }else{
     }else{
       return checkRes;
       return checkRes;

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

@@ -1276,8 +1276,11 @@ class OrderInfoService extends ServiceBase {
       //   channelCode:deliveryContent.channelCode,
       //   channelCode:deliveryContent.channelCode,
       //   notes:ab.notes || ""
       //   notes:ab.notes || ""
       // };
       // };
-      orderdeliveryRes = await this.getOrderDelivery(orderNo);
-      return system.getResultSuccess({orderdelivery:orderdeliveryRes});
+      orderdeliveryRes = await self.getOrderDelivery(orderNo);
+      if(orderdeliveryRes && orderdeliveryRes.length>0){
+        return system.getResultSuccess(orderdeliveryRes[0]);
+      }
+      return system.getResultSuccess();
     })
     })
   }
   }