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

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

business/jxcallback/orderman/orderman.go

@@ -142,17 +142,17 @@ func LoadPendingOrders() {
 			if order, ok := item.(*model.GoodsOrder); ok {
 				jxutils.CallMsgHandlerAsync(func() {
 					scheduler.CurrentScheduler.OnOrderNew(order, true)
-				}, order.VendorOrderID)
+				}, jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID))
 			} else if status, ok := item.(*model.OrderStatus); ok {
 				jxutils.CallMsgHandlerAsync(func() {
 					order := orderMap[jxutils.ComposeUniversalOrderID(status.VendorOrderID, status.VendorID)]
 					scheduler.CurrentScheduler.OnOrderStatusChanged(order, status, true)
-				}, status.VendorOrderID)
+				}, jxutils.ComposeUniversalOrderID(status.RefVendorOrderID, status.RefVendorID))
 			} else {
 				bill := item.(*model.Waybill)
 				jxutils.CallMsgHandlerAsync(func() {
 					scheduler.CurrentScheduler.OnWaybillStatusChanged(bill, true)
-				}, bill.VendorOrderID)
+				}, jxutils.ComposeUniversalOrderID(bill.VendorOrderID, bill.OrderVendorID))
 			}
 			curTime := time.Now()
 			timeout := sleepGap - curTime.Sub(lastTime)