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-08-04 13:58:02 +08:00
parent 32e82fb0c1
commit 2463ec8e33
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1719,10 +1719,10 @@ func SendFailedMatterOrder(ctx *jxcontext.Context, vendorOrderID string) (err er
if order == nil || order.StoreID != model.MatterStoreID || order.FromStoreID == 0 { if order == nil || order.StoreID != model.MatterStoreID || order.FromStoreID == 0 {
return fmt.Errorf("只允许物料店重发物料订单调用此接口！") return fmt.Errorf("只允许物料店重发物料订单调用此接口！")
} }
queryOrderStatus, err := api.JdEclpAPI.QueryOrderStatus(order.EclpOutID) // queryOrderStatus, err := api.JdEclpAPI.QueryOrderStatus(order.EclpOutID)
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 != "" { //这是不分包的订单 if len(order.VendorOrderID) == 14 && order.EclpOutID != "" { //这是不分包的订单
_, err = createMatterOrder(buildJxOrderInfo(order, order.Skus), order, int64(00)) _, err = createMatterOrder(buildJxOrderInfo(order, order.Skus), order, int64(00))
err = CancelMatterOrder(db, order, cancelMatterOrderReason) err = CancelMatterOrder(db, order, cancelMatterOrderReason)
@@ -1753,10 +1753,10 @@ func SendFailedMatterOrder(ctx *jxcontext.Context, vendorOrderID string) (err er
} else if len(order.VendorOrderID) == 16 && order.EclpOutID != "" { // 这是分包的子订单 } else if len(order.VendorOrderID) == 16 && order.EclpOutID != "" { // 这是分包的子订单
return fmt.Errorf("请重发主订单！主订单号：[%v]", order.VendorOrderID[len(order.VendorOrderID)-2:]) return fmt.Errorf("请重发主订单！主订单号：[%v]", order.VendorOrderID[len(order.VendorOrderID)-2:])
} }
} else { // } else {
return fmt.Errorf("只允许物流订单为暂停或逆向完成才能调用此接口！") // return fmt.Errorf("只允许物流订单为暂停或逆向完成才能调用此接口！")
} // }
} // }
return err return err
} }