This commit is contained in:
rosydev
2022-01-27 17:12:39 +08:00
parent a67fe323e7
commit 95b2f35387

View File

@@ -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
}
//有可能是库里已经有这个订单了