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

失败重发修改

Browse Source
This commit is contained in:
苏尹岚
2020-10-14 16:09:51 +08:00
parent ee8f342617
commit d0abf3f7ff
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1946,17 +1946,8 @@ func SendFailedMatterOrder(ctx *jxcontext.Context, vendorOrderID string) (err er
// if len(queryOrderStatus.OrderStatusList) > 0 { // if len(queryOrderStatus.OrderStatusList) > 0 {
// code := queryOrderStatus.OrderStatusList[len(queryOrderStatus.OrderStatusList)-1].SoStatusCode // code := queryOrderStatus.OrderStatusList[len(queryOrderStatus.OrderStatusList)-1].SoStatusCode
// if code == jdeclpapi.SoStatusCode10022 || code == jdeclpapi.SoStatusCode10038 { //表示该订单在京东物流为暂停或已经逆向发货完成 // if code == jdeclpapi.SoStatusCode10022 || code == jdeclpapi.SoStatusCode10038 { //表示该订单在京东物流为暂停或已经逆向发货完成
if len(order.VendorOrderID) == 14 && order.EclpOutID != "" { //这是不分包的订单 childs, err := dao.GetMatterChildOrders(db, vendorOrderID)
_, err = createMatterOrder(buildJxOrderInfo(order, order.Skus), order, int64(01)) if len(childs) > 0 {
if err != nil {
globals.SugarLogger.Debugf("SendFailedMatterOrder err : [%v]", err)
return err
}
changeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, cancelMatterOrderReason)
for _, v := range order.Skus {
cms.RefreshMatterStock(jxcontext.AdminCtx, v.SkuID)
}
} else if len(order.VendorOrderID) == 14 && order.EclpOutID == "" { //这是分包的主订单
goodsList, err := dao.GetMatterChildOrders(db, order.VendorOrderID) goodsList, err := dao.GetMatterChildOrders(db, order.VendorOrderID)
if err != nil { if err != nil {
return err return err
@@ -1975,9 +1966,24 @@ func SendFailedMatterOrder(ctx *jxcontext.Context, vendorOrderID string) (err er
} }
} }
changeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, cancelMatterOrderReason) changeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, cancelMatterOrderReason)
} else if len(order.VendorOrderID) == 16 && order.EclpOutID != "" { // 这是分包的子订单 } else {
return fmt.Errorf("请重发主订单！主订单号：[%v]", order.VendorOrderID[len(order.VendorOrderID)-2:]) _, err = createMatterOrder(buildJxOrderInfo(order, order.Skus), order, int64(01))
if err != nil {
globals.SugarLogger.Debugf("SendFailedMatterOrder err : [%v]", err)
return err
}
changeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, cancelMatterOrderReason)
for _, v := range order.Skus {
cms.RefreshMatterStock(jxcontext.AdminCtx, v.SkuID)
}
} }
// if len(order.VendorOrderID) == 14 && order.EclpOutID != "" { //这是不分包的订单
// } else if len(order.VendorOrderID) == 14 && order.EclpOutID == "" { //这是分包的主订单
// } else if len(order.VendorOrderID) == 16 && order.EclpOutID != "" { // 这是分包的子订单
// return fmt.Errorf("请重发主订单！主订单号：[%v]", order.VendorOrderID[len(order.VendorOrderID)-2:])
// }
// } else { // } else {
// return fmt.Errorf("只允许物流订单为暂停或逆向完成才能调用此接口！") // return fmt.Errorf("只允许物流订单为暂停或逆向完成才能调用此接口！")
// } // }