- 统一清理调用CallMsgHandlerAsync时的primaryID设置

- defsch中，自动接单调用OnOrderStatusChanged改为异步，防止死循环

business/partner/delivery/dada/waybill.go

@@ -50,7 +50,7 @@ func (c *DeliveryHandler) GetVendorID() int {
 func (c *DeliveryHandler) OnWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaapi.CallbackResponse) {
 	jxutils.CallMsgHandler(func() {
 		retVal = c.onWaybillMsg(msg)
-	}, msg.OrderID)
+	}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDDada))
 	return retVal
 }
 

business/partner/delivery/mtps/waybill.go

@@ -55,7 +55,7 @@ func OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionMsg) (retVal *mtpsapi.Ca
 func (c *DeliveryHandler) OnWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) {
 	jxutils.CallMsgHandler(func() {
 		retVal = c.onWaybillMsg(msg)
-	}, msg.OrderID)
+	}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDMTPS))
 	return retVal
 }
 
@@ -73,7 +73,7 @@ func (c *DeliveryHandler) OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionMsg
 		}
 		order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(msg.OrderID)
 		retVal = mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), "mtps OnWaybillExcept")
-	}, msg.OrderID)
+	}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDDada))
 	return retVal
 }