From 95b2f35387c90e339e400196e9a08424f2127afe Mon Sep 17 00:00:00 2001 From: rosydev Date: Thu, 27 Jan 2022 17:12:39 +0800 Subject: [PATCH] jdshop --- business/jxcallback/orderman/order.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 53eb592f3..aaa076faa 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -1955,7 +1955,7 @@ func SaveJdsOrders(ctx *jxcontext.Context, orderCreatedStart, orderCreatedEnd ti } orders, err := result2Orders(ctx, orderResult) if orderResult.TotalCount > pageSize { - for pageNO := 2; pageNO < orderResult.TotalCount/pageSize+1; pageNO++ { + for pageNO := 2; pageNO <= orderResult.TotalCount/pageSize+1; pageNO++ { orderResult, _ := jdshop.CurPurchaseHandler.GetJdsOrders(ctx, utils.Time2Str(orderCreatedStart), utils.Time2Str(orderCreatedEnd), pageNO, pageSize) orders2, _ := result2Orders(ctx, orderResult) orders = append(orders, orders2...) @@ -1983,7 +1983,11 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o ) for _, jdsOrder := range result.OrderList { //等待付款的排除 - if jdsOrder.OrderStatus == jdshopapi.JdsOrderStatusWaittingPay || jdsOrder.OrderStatus == jdshopapi.JdsOrderStatusWaittingPayDel || jdsOrder.OrderStatus == 51 || jdsOrder.OrderStatus == 50 { + //完成 19 + //配送中 52 + //待配送 51 + //待接单 50 + if jdsOrder.OrderStatus == jdshopapi.JdsOrderStatusWaittingPay || jdsOrder.OrderStatus == jdshopapi.JdsOrderStatusWaittingPayDel { continue } //有可能是库里已经有这个订单了