This commit is contained in:
邹宗楠
2025-01-13 10:00:20 +08:00
parent 235796c353
commit bbe2a71c03

View File

@@ -1498,10 +1498,10 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
pair := batchItemList[0].(*tOrderVendorPair) pair := batchItemList[0].(*tOrderVendorPair)
if handler := partner.GetPurchaseOrderHandlerFromVendorID(pair.VendorID); handler != nil { if handler := partner.GetPurchaseOrderHandlerFromVendorID(pair.VendorID); handler != nil {
storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), pair.VendorStoreID, pair.VendorID, pair.VendorOrgCode) order, err2 := handler.GetOrder(pair.VendorOrgCode, pair.VendorOrderID, pair.VendorStoreID)
if err == nil && storeDetail != nil { if err = err2; err == nil {
order, err2 := handler.GetOrder(pair.VendorOrgCode, pair.VendorOrderID, pair.VendorStoreID) storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), order.VendorStoreID, order.VendorID, order.VendorOrgCode)
if err = err2; err == nil { if err == nil && storeDetail != nil {
isDuplicated, err2 := c.SaveOrder(order, false, dao.GetDB()) isDuplicated, err2 := c.SaveOrder(order, false, dao.GetDB())
if err2 == nil && !isDuplicated { if err2 == nil && !isDuplicated {
retVal = []int{1} retVal = []int{1}
@@ -1509,10 +1509,10 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in
err = handler.AcceptOrRefuseOrder(order, true, ctx.GetUserName()) err = handler.AcceptOrRefuseOrder(order, true, ctx.GetUserName())
} }
} }
} else if pair.VendorID == model.VendorIDMTWM { }
if strings.Contains(err.Error(), "token不存在或已经过期") { } else if pair.VendorID == model.VendorIDMTWM {
err = nil if strings.Contains(err.Error(), "token不存在或已经过期") {
} err = nil
} }
} }
} }