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

1'

Browse Source
This commit is contained in:
邹宗楠
2023-05-23 19:06:47 +08:00
parent bb57eacecc
commit dcc5c91f58
6 changed files with 18 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/partner/delivery/dada/waybill.go
View File

@@ -358,7 +358,6 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
}
// 重新发送订单
result, err = api.DadaAPI.ReaddOrder(billParams)
globals.SugarLogger.Debugf("重新发送订单多次发单======== := %s", utils.Format4Output(result, false))
if err != nil {
return nil, err
}
@@ -368,7 +367,6 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
if result, err = api.DadaAPI.QueryDeliverFee(billParams); err != nil {
return nil, err
}
globals.SugarLogger.Debugf("查询达达订单费用(第一次发单)======== := %s", utils.Format4Output(result, false))
// 阀值警报
if err = delivery.CallCreateWaybillPolicy(jxutils.StandardPrice2Int(result.Fee), maxDeliveryFee, order, model.VendorIDDada); err != nil {
return nil, err
@@ -377,7 +375,6 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
if err = api.DadaAPI.AddOrderAfterQuery(result.DeliveryNo); err != nil {
return nil, err
}
globals.SugarLogger.Debugf("重新发送订单======== := %s", utils.Format4Output(result, false))
}
if result == nil {
return nil, errors.New("达达配送,平台调用错误,无订单数据返回")

12
business/partner/delivery/fn/waybill.go
View File

@@ -210,6 +210,17 @@ func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify, resultParam *fnpsapi.ShortSta
if err := utils.Map2StructByJson(msg.Param, cc, true); err != nil {
return fnpsapi.Err2CallbackResponse(err, "")
}
// 多次取消,只处理第一次
if cc.OrderStatus == fnpsapi.OrderStatusAcceptCacle {
bill, err := partner.CurOrderManager.LoadWaybill(utils.Int64ToStr(cc.OrderId), model.VendorIDFengNiao)
if err != nil {
return fnpsapi.Err2CallbackResponse(err, "")
}
if bill.Status == model.OrderStatusCanceled {
return fnpsapi.Err2CallbackResponse(nil, "")
}
}
var good *model.GoodsOrder
sql := `SELECT * FROM goods_order WHERE vendor_order_id = ? ORDER BY order_created_at DESC LIMIT 1 OFFSET 0`
sqlParams := []interface{}{cc.PartnerOrderCode}
@@ -256,6 +267,7 @@ func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify, resultParam *fnpsapi.ShortSta
order.Status = model.WaybillStatusDelivered
case fnpsapi.OrderStatusAcceptCacle: // 4取消订单
order.Status = model.WaybillStatusCanceled
order.VendorStatus = utils.Int2Str(fnpsapi.OrderStatusAcceptCacle)
case fnpsapi.OrderStatusException: // 5 异常
order.Status = model.WaybillStatusDeliverFailed // 22
default: