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

修改美团创建订单以及删除订单是返回参数结构体不一致,导致类型转换错误,修改预请求是,shopId传入错误,删除打桩语句

Browse Source
This commit is contained in:
邹宗楠
2022-03-09 15:21:17 +08:00
parent cff4e7fb01
commit ca62a02bdd
3 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxcallback/scheduler/basesch/basesch.go
View File

@@ -200,7 +200,6 @@ func (c *BaseScheduler) CancelWaybill(bill *model.Waybill, cancelReasonID int, c
if c.IsReallyCallPlatformAPI && bill.OrderVendorID != bill.WaybillVendorID && bill.Status != model.WaybillStatusCanceled { if c.IsReallyCallPlatformAPI && bill.OrderVendorID != bill.WaybillVendorID && bill.Status != model.WaybillStatusCanceled {
if handlerInfo := partner.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil { if handlerInfo := partner.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil {
if err = utils.CallFuncLogErrorWithInfo(func() error { if err = utils.CallFuncLogErrorWithInfo(func() error {
globals.SugarLogger.Info("开始美团配送订单取消:====================", handlerInfo.Handler)
return handlerInfo.Handler.CancelWaybill(bill, cancelReasonID, cancelReason) return handlerInfo.Handler.CancelWaybill(bill, cancelReasonID, cancelReason)
}, "CancelWaybill bill:%v", bill); err == nil { }, "CancelWaybill bill:%v", bill); err == nil {
bill.Status = model.WaybillStatusCanceled bill.Status = model.WaybillStatusCanceled

13
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -960,9 +960,7 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2
cc && cc &&
(bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)) { (bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)) {
globals.SugarLogger.Info("===========================================1")
err2 := s.CancelWaybill(v, cancelReasonID, cancelReason) err2 := s.CancelWaybill(v, cancelReasonID, cancelReason)
globals.SugarLogger.Info("===========================================2", err2)
if err2 == nil { if err2 == nil {
// 在这里就从map里删除，而不是等收到运单结束事件才删除，可避免不必要的重复取消（第二次取消还会失败） // 在这里就从map里删除，而不是等收到运单结束事件才删除，可避免不必要的重复取消（第二次取消还会失败）
s.removeWaybillFromMap(savedOrderInfo, v.WaybillVendorID) s.removeWaybillFromMap(savedOrderInfo, v.WaybillVendorID)
@@ -975,7 +973,6 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2
} }
} }
} }
globals.SugarLogger.Info("===========================================3", err)
return err return err
} }
@@ -1051,16 +1048,6 @@ func (s *DefScheduler) loadSavedOrderFromMap(status *model.OrderStatus, isForceL
globals.SugarLogger.Infof("loadSavedOrderFromMap can not load order orderID:%s with error:%v", status.RefVendorOrderID, err) globals.SugarLogger.Infof("loadSavedOrderFromMap can not load order orderID:%s with error:%v", status.RefVendorOrderID, err)
} }
} }
gg := len(realSavedInfo.waybills)
globals.SugarLogger.Info("=================gg", gg)
for _, v := range realSavedInfo.waybills {
globals.SugarLogger.Info("=================gg", v.ID)
globals.SugarLogger.Info("=================gg", v.VendorOrderID)
globals.SugarLogger.Info("=================gg", v.Status)
globals.SugarLogger.Info("=================gg", v.DesiredFee)
}
return realSavedInfo return realSavedInfo
} }

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

@@ -335,14 +335,11 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int,
if err != nil { if err != nil {
return err return err
} }
globals.SugarLogger.Info("===========================================order", order)
globals.SugarLogger.Info("===========================================bill", bill)
cancelReasonID = mtpsapi.CancelReasonMerchantOther cancelReasonID = mtpsapi.CancelReasonMerchantOther
if cancelReason == "" { if cancelReason == "" {
cancelReason = "顾客主动取消" cancelReason = "顾客主动取消"
} }
_, err = api.MtpsAPI.CancelOrder(order.ID+1000000, bill.VendorWaybillID, cancelReasonID, cancelReason) _, err = api.MtpsAPI.CancelOrder(order.ID+1000000, bill.VendorWaybillID, cancelReasonID, cancelReason)
globals.SugarLogger.Info("===========================================order-err", err)
return err return err
} }