diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 762a0c544..fd9f9dde1 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -1489,15 +1489,17 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in task2 := tasksch.NewParallelTask("AmendMissingOrders GetOrders", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { pair := batchItemList[0].(*tOrderVendorPair) - if handler := partner.GetPurchaseOrderHandlerFromVendorID(pair.VendorID); handler != nil { + store, err3 := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), pair.VendorStoreID, pair.VendorID, pair.VendorOrgCode) + if handler := partner.GetPurchaseOrderHandlerFromVendorID(pair.VendorID); handler != nil && err3 == nil && store != nil { order, err2 := handler.GetOrder(pair.VendorOrgCode, pair.VendorOrderID, pair.VendorStoreID) - if err = err2; err == nil { - isDuplicated, err2 := c.SaveOrder(order, false, dao.GetDB()) - if err2 == nil && !isDuplicated { - retVal = []int{1} - if order.Status == model.OrderStatusNew { - err = handler.AcceptOrRefuseOrder(order, true, ctx.GetUserName()) + if store != nil && err3 == nil { + isDuplicated, err2 := c.SaveOrder(order, false, dao.GetDB()) + if err2 == nil && !isDuplicated { + retVal = []int{1} + if order.Status == model.OrderStatusNew { + err = handler.AcceptOrRefuseOrder(order, true, ctx.GetUserName()) + } } } } else if pair.VendorID == model.VendorIDMTWM { @@ -1514,7 +1516,8 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in task3 := tasksch.NewParallelTask("AmendMissingOrders UpdateOrders", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { goodsOrder := batchItemList[0].(*model.GoodsOrder) - if handler := partner.GetPurchaseOrderHandlerFromVendorID(goodsOrder.VendorID); handler != nil { + store, err3 := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), goodsOrder.VendorStoreID, goodsOrder.VendorID, goodsOrder.VendorOrgCode) + if handler := partner.GetPurchaseOrderHandlerFromVendorID(goodsOrder.VendorID); handler != nil && store != nil && err3 == nil { order, err2 := handler.GetOrder(goodsOrder.VendorOrgCode, goodsOrder.VendorOrderID, goodsOrder.VendorStoreID) if err = err2; err == nil { if model.IsOrderFinalStatus(order.Status) {