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-09-17 10:52:36 +08:00
parent 4b881304bd 6e5b3ea3cb
commit 246d33de36
37 changed files with 1168 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1155,6 +1155,8 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
outOrders, _, _ := tryToSplitMatterOrder(buildJxOrderInfo(order, orderSkus))
//以下为仿照CreateOrder，改了一些参数
for k, v := range outOrders {
v.OrderType = model.OrderTypeMatter
v.FromStoreID = order.FromStoreID
outJxOrder, deliveryAddress, err := generateOrder(jxcontext.AdminCtx, v, order.AddressID, order.FromStoreID, order.UserID, false)
if err != nil {
return err
@@ -1661,7 +1663,7 @@ func GetMatterOrderStatus(ctx *jxcontext.Context, vendorOrderID string) (result
}
queryOrderStatus, err := api.JdEclpAPI.QueryOrderStatus(order.EclpOutID)
getTrackMessagePlusByOrderResult, err := api.JdEclpAPI.GetTrackMessagePlusByOrder(vendorOrderID)
if err != nil {
if err != nil || queryOrderStatus == nil {
return nil, err
}
if len(queryOrderStatus.OrderStatusList) > 0 {
@@ -1921,6 +1923,10 @@ func SendFailedMatterOrder(ctx *jxcontext.Context, vendorOrderID string) (err er
// if code == jdeclpapi.SoStatusCode10022 || code == jdeclpapi.SoStatusCode10038 { //表示该订单在京东物流为暂停或已经逆向发货完成
if len(order.VendorOrderID) == 14 && order.EclpOutID != "" { //这是不分包的订单
_, err = createMatterOrder(buildJxOrderInfo(order, order.Skus), order, int64(01))
if err != nil {
globals.SugarLogger.Debugf("SendFailedMatterOrder err : [%v]", err)
return err
}
err = CancelMatterOrder(db, order, cancelMatterOrderReason)
changeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, cancelMatterOrderReason)
for _, v := range order.Skus {
@@ -1944,7 +1950,7 @@ func SendFailedMatterOrder(ctx *jxcontext.Context, vendorOrderID string) (err er
}
}
}
err = CancelMatterOrder(db, order, cancelMatterOrderReason)
// err = CancelMatterOrder(db, order, cancelMatterOrderReason)
changeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, cancelMatterOrderReason)
} else if len(order.VendorOrderID) == 16 && order.EclpOutID != "" { // 这是分包的子订单
return fmt.Errorf("请重发主订单！主订单号：[%v]", order.VendorOrderID[len(order.VendorOrderID)-2:])