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

Merge remote-tracking branch 'origin/jdshop' into jxact

Browse Source
This commit is contained in:
苏尹岚
2020-08-18 08:49:00 +08:00
parent d4a7014280 927c261f0d
commit 9589d9562c
19 changed files with 262 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,6 +127,13 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
return nil, err
}
if msg.IDSopShipmenttype == jdshopapi.IdSopShipmenttypeTC {
if time, err := api.JdShopAPI.GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil {
order.BusinessType = model.BusinessTypeDingshida
order.ExpectedDeliveredTime = utils.Str2Time(time)
}
}
//结算类型
storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.StoreID, model.VendorIDJDShop)
if storeDetail != nil {

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

@@ -1527,14 +1527,17 @@ func GetMatterOrderStatus(ctx *jxcontext.Context, vendorOrderID string) (result
if err != nil {
return nil, err
}
for _, v := range queryOrderStatus.OrderStatusList {
matter := &MatterOrderStatus{}
matter.Time = utils.Str2Time(v.OperateTime)
matter.Status = v.SoStatusName
matter.Name = v.SoStatusName
matter.Sign = 1
result = append(result, matter)
if len(queryOrderStatus.OrderStatusList) > 0 {
for _, v := range queryOrderStatus.OrderStatusList {
matter := &MatterOrderStatus{}
matter.Time = utils.Str2Time(v.OperateTime)
matter.Status = v.SoStatusName
matter.Name = v.SoStatusName
matter.Sign = 1
result = append(result, matter)
}
}
if len(getTrackMessagePlusByOrderResult.ResultData) > 0 {
for _, vv := range getTrackMessagePlusByOrderResult.ResultData {
matter := &MatterOrderStatus{}