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:
苏尹岚
2020-12-01 11:22:02 +08:00
parent ad896f8d3a
commit 0bb932bcb4
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/orderman/orderman_ext.go
View File

@@ -968,7 +968,7 @@ func (c *OrderManager) getAfsOrderSkuInfo4ExportOrders(ctx *jxcontext.Context, f
if err = err2; err != nil { if err = err2; err != nil {
return nil, err return nil, err
} }
toDate = toDate.Add(7 * 24 * time.Hour) // todo 售后单最多只可能延后7天吧 toDate = toDate.Add(30 * 24 * time.Hour) // todo 售后单最多只可能延后7天吧
sql := ` sql := `
SELECT t2.* SELECT t2.*
FROM afs_order t1 FROM afs_order t1

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

@@ -111,6 +111,7 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
DeliveryType: model.OrderDeliveryTypeStoreSelf, DeliveryType: model.OrderDeliveryTypeStoreSelf,
StatusTime: utils.Str2Time(msg.OrderStartTime), StatusTime: utils.Str2Time(msg.OrderStartTime),
OrderSeq: 0, OrderSeq: 0,
VendorOrgCode: msg.VendorOrgCode,
} }
if len(msg.ConsigneeInfo.Mobile) != 11 { if len(msg.ConsigneeInfo.Mobile) != 11 {
order.ConsigneeMobile = Decrypt(msg.ConsigneeInfo.Mobile) order.ConsigneeMobile = Decrypt(msg.ConsigneeInfo.Mobile)
@@ -231,7 +232,7 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
// 如果是暂停，表示是预订单g // 如果是暂停，表示是预订单g
if msg.OrderState == jdshopapi.OrderStatusPause || msg.OrderState == jdshopapi.OrderStatusPopPause { if msg.OrderState == jdshopapi.OrderStatusPause || msg.OrderState == jdshopapi.OrderStatusPopPause {
order.BusinessType = model.BusinessTypeDingshida order.BusinessType = model.BusinessTypeDingshida
if time2, err := api.JdShopAPI.GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil { if time2, err := getAPI(msg.VendorOrgCode).GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil {
if time2 == "" { if time2 == "" {
order.ExpectedDeliveredTime = order.OrderCreatedAt.Add(time.Hour) order.ExpectedDeliveredTime = order.OrderCreatedAt.Add(time.Hour)
} else { } else {
@@ -247,7 +248,7 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
return nil, err return nil, err
} }
if msg.IDSopShipmenttype == jdshopapi.IdSopShipmenttypeTC { if msg.IDSopShipmenttype == jdshopapi.IdSopShipmenttypeTC {
if time2, err := api.JdShopAPI.GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil { if time2, err := getAPI(msg.VendorOrgCode).GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil {
order.BusinessType = model.BusinessTypeDingshida order.BusinessType = model.BusinessTypeDingshida
if time2 == "" { if time2 == "" {
order.ExpectedDeliveredTime = order.OrderCreatedAt.Add(time.Hour) order.ExpectedDeliveredTime = order.OrderCreatedAt.Add(time.Hour)