diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index bcaa6171c..e7217ef57 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -1401,7 +1401,6 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in VendorOrgCode string VendorStoreID string } - globals.SugarLogger.Debugf("--------------dateVendorList := %s", utils.Format4Output(dateVendorList, false)) if len(dateVendorList) > 0 { var missingOrderList []*tOrderVendorPair var updateOrderStatusList []*model.GoodsOrder @@ -1425,7 +1424,6 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in vendorDate := batchItemList[0].(*tDateVendorPair) if handler, _ := partner.GetPurchaseOrderHandlerFromVendorID(vendorDate.VendorID).(partner.IPurchasePlatformStoreSkuHandler); handler != nil { orderIDs, err2 := handler.ListOrders(ctx, vendorDate.VendorOrgCode, task, vendorDate.QueryDate, vendorStoreIDMap[vendorDate.VendorID]) - globals.SugarLogger.Debugf("===========orderIDs := %s", utils.Format4Output(orderIDs, false)) if err = err2; err == nil && len(orderIDs) > 0 { var orderList []*tOrderVendorPair for _, v := range orderIDs { @@ -1440,7 +1438,6 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in VendorStoreID: vendorStoreID, }) } - globals.SugarLogger.Debugf("===========orderList := %s", utils.Format4Output(orderList, false)) retVal = orderList } } @@ -1486,7 +1483,6 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { pair := batchItemList[0].(*tOrderVendorPair) if handler := partner.GetPurchaseOrderHandlerFromVendorID(pair.VendorID); handler != nil { - globals.SugarLogger.Debugf("===========orderList := %s , %s", utils.Format4Output(pair.VendorOrderID, false), pair.VendorStoreID) order, err2 := handler.GetOrder(pair.VendorOrgCode, pair.VendorOrderID, pair.VendorStoreID) if err = err2; err == nil { @@ -1495,8 +1491,6 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in } isDuplicated, err2 := c.SaveOrder(order, false, dao.GetDB()) - globals.SugarLogger.Debugf("===========isDuplicated := %s , %v", utils.Format4Output(isDuplicated, false), err2) - globals.SugarLogger.Debugf("===========order := %s ", utils.Format4Output(order, false)) if err2 == nil && !isDuplicated { retVal = []int{1} if order.Status == model.OrderStatusNew { diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index 07109f73d..e53de26f6 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -778,36 +778,11 @@ func (c *PurchaseHandler) ListOrders(ctx *jxcontext.Context, vendorOrgCode strin func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { vendorStoreID := batchItemList[0].(string) var orderIDs []string - //seqStart := 1 - //i := 0 - for { - //batchSize := int(math.Min(math.Pow(2, float64(i*3)), float64(mtwmapi.MaxGap4GetOrderIdByDaySeq))) - //seqEnd := seqStart + batchSize - 1 - //var tmpOrderIDs []int64 - //if seqStart == seqEnd { - // if vendorOderID, err2 := getAPI(vendorOrgCode, 0, vendorStoreID).GetOrderIdByDaySeqSingle(vendorStoreID, queryDate, seqStart); err2 == nil { - // tmpOrderIDs = []int64{vendorOderID} - // } - //} else { - // tmpOrderIDs, err = getAPI(vendorOrgCode, 0, vendorStoreID).GetOrderIdByDaySeq(vendorStoreID, queryDate, seqStart, seqEnd) - //} - - tmpOrderIDs, _ := getAPI(vendorOrgCode, 0, vendorStoreID).EcommerceGetOrderIdByPage(vendorStoreID, queryDate, endData) - globals.SugarLogger.Debugf("-------------------tmpOrderIDs := %s", utils.Format4Output(tmpOrderIDs, false)) - globals.SugarLogger.Debugf("-------------------queryDate := %s", utils.Format4Output(queryDate, false)) - globals.SugarLogger.Debugf("-------------------endData := %s", utils.Format4Output(endData, false)) - globals.SugarLogger.Debugf("-------------------vendorStoreID := %s", utils.Format4Output(vendorStoreID, false)) - if len(tmpOrderIDs) > 0 { - for _, v := range tmpOrderIDs { - orderIDs = append(orderIDs, utils.Int64ToStr(v)) - } + tmpOrderIDs, _ := getAPI(vendorOrgCode, 0, vendorStoreID).EcommerceGetOrderIdByPage(vendorStoreID, queryDate, endData) + if len(tmpOrderIDs) > 0 { + for _, v := range tmpOrderIDs { + orderIDs = append(orderIDs, utils.Int64ToStr(v)) } - if err != nil /*|| len(tmpOrderIDs) < batchSize */ { - err = nil - break - } - //seqStart = seqEnd + 1 - //i++ } retVal = orderIDs return retVal, nil