liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-10-22 16:40:25 +08:00
parent 22ebe82f8e
commit 1607e9cfa8
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/jxcallback/orderman/order.go
View File

@@ -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) orderResult, err := jdshop.CurPurchaseHandler.GetJdsOrders(ctx, utils.Time2Str(orderCreatedStart), utils.Time2Str(orderCreatedEnd), 1, pageSize)
if orderResult.TotalCount > pageSize { if orderResult.TotalCount > pageSize {
for pageNO := 2; pageNO < orderResult.TotalCount/pageSize+1; pageNO++ { for pageNO := 1; pageNO < orderResult.TotalCount/pageSize+1; pageNO++ {
orderResult, _ := jdshop.CurPurchaseHandler.GetJdsOrders(ctx, utils.Time2Str(orderCreatedStart), utils.Time2Str(orderCreatedEnd), pageNO, pageSize) orderResult2, _ := jdshop.CurPurchaseHandler.GetJdsOrders(ctx, utils.Time2Str(orderCreatedStart), utils.Time2Str(orderCreatedEnd), pageNO, pageSize)
for _, order := range orderResult.OrderList { for _, order := range orderResult2.OrderList {
if order.OrderStatus == jdshopapi.OrderStatusCancelm2 { if order.OrderStatus == jdshopapi.OrderStatusCancelm2 {
orderIDs = append(orderIDs, order.OrderID) orderIDs = append(orderIDs, order.OrderID)
} }

2
business/partner/purchase/jdshop/callback.go
View File

@@ -31,6 +31,8 @@ import (
"git.rosy.net.cn/jx-callback/globals/api2" "git.rosy.net.cn/jx-callback/globals/api2"
) )
//TODO 以下是京东商城云顶推送消息使用的代码，现在都是以网页爬取的形式拿订单了，下面的都不用了
//TODO 位置在 orderman/order.go 的 SaveJdsOrders
func OnCallbackMsg(msg *jdshopapi.CallBackResult) (err error) { func OnCallbackMsg(msg *jdshopapi.CallBackResult) (err error) {
msgType := msg.MsgType msgType := msg.MsgType
switch msgType { switch msgType {

2
business/partner/purchase/jx/localjx/order.go
View File

@@ -1305,7 +1305,7 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
if err != nil { if err != nil {
return err return err
} }
//分包后的子订单ID默认是后面加两位（目前的规则），要改的话要注意取消订单那的判断 //分包后的子订单ID默认是原订单ID后面加两位（目前的规则），要改的话要注意取消订单那的判断
outJxOrder.OrderID = utils.Str2Int64(order.VendorOrderID)*100 + int64(k+1) outJxOrder.OrderID = utils.Str2Int64(order.VendorOrderID)*100 + int64(k+1)
checkMatterDeliveryAddress(deliveryAddress) checkMatterDeliveryAddress(deliveryAddress)
order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress, order.UserID, false, nil) order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress, order.UserID, false, nil)