diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 23c5ae75f..865d7b4c5 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -1918,9 +1918,9 @@ func UpdateJdsOrdersStatus(ctx *jxcontext.Context, orderCreatedStart, orderCreat ) orderResult, err := jdshop.CurPurchaseHandler.GetJdsOrders(ctx, utils.Time2Str(orderCreatedStart), utils.Time2Str(orderCreatedEnd), 1, pageSize) if orderResult.TotalCount > pageSize { - for pageNO := 2; pageNO < orderResult.TotalCount/pageSize+1; pageNO++ { - orderResult, _ := jdshop.CurPurchaseHandler.GetJdsOrders(ctx, utils.Time2Str(orderCreatedStart), utils.Time2Str(orderCreatedEnd), pageNO, pageSize) - for _, order := range orderResult.OrderList { + for pageNO := 1; pageNO < orderResult.TotalCount/pageSize+1; pageNO++ { + orderResult2, _ := jdshop.CurPurchaseHandler.GetJdsOrders(ctx, utils.Time2Str(orderCreatedStart), utils.Time2Str(orderCreatedEnd), pageNO, pageSize) + for _, order := range orderResult2.OrderList { if order.OrderStatus == jdshopapi.OrderStatusCancelm2 { orderIDs = append(orderIDs, order.OrderID) } diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go index 48e1b374e..a1b10b868 100644 --- a/business/partner/purchase/jdshop/callback.go +++ b/business/partner/purchase/jdshop/callback.go @@ -31,6 +31,8 @@ import ( "git.rosy.net.cn/jx-callback/globals/api2" ) +//TODO 以下是京东商城云顶推送消息使用的代码,现在都是以网页爬取的形式拿订单了,下面的都不用了 +//TODO 位置在 orderman/order.go 的 SaveJdsOrders func OnCallbackMsg(msg *jdshopapi.CallBackResult) (err error) { msgType := msg.MsgType switch msgType { diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 4e19f97ad..44f07e615 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -1305,7 +1305,7 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) { if err != nil { return err } - //分包后的子订单ID默认是后面加两位(目前的规则),要改的话要注意取消订单那的判断 + //分包后的子订单ID默认是原订单ID后面加两位(目前的规则),要改的话要注意取消订单那的判断 outJxOrder.OrderID = utils.Str2Int64(order.VendorOrderID)*100 + int64(k+1) checkMatterDeliveryAddress(deliveryAddress) order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress, order.UserID, false, nil)