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:
邹宗楠
2022-04-08 14:35:10 +08:00
parent 5072e1f31e
commit d9f438ca26
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,9 +191,9 @@ func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOr
balance = 0 balance = 0
} }
} }
fmt.Println("1111111111111111111111",storeAcct) fmt.Println("1111111111111111111111", storeAcct)
fmt.Println("1111111111111111111111",result) fmt.Println("1111111111111111111111", result)
fmt.Println("1111111111111111111111",balance) fmt.Println("1111111111111111111111", balance)
//balance, _ = partner.CurStoreAcctManager.GetBrandBalance(storeDetail.BrandID) //balance, _ = partner.CurStoreAcctManager.GetBrandBalance(storeDetail.BrandID)
handlerInfo := partner.GetDeliveryPlatformFromVendorID(platformVendorID) handlerInfo := partner.GetDeliveryPlatformFromVendorID(platformVendorID)
if handlerInfo != nil && handlerInfo.Use4CreateWaybill { if handlerInfo != nil && handlerInfo.Use4CreateWaybill {
@@ -223,6 +223,7 @@ 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 {
fmt.Println("cancale ==================111", 22)
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

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

@@ -967,6 +967,7 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2
if v.Status < model.WaybillStatusEndBegin && if v.Status < model.WaybillStatusEndBegin &&
!model.IsWaybillPlatformOwn(v) && !model.IsWaybillPlatformOwn(v) &&
(bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)) { (bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)) {
fmt.Println("111111111111========cancel_Order", 1)
err2 := s.CancelWaybill(v, cancelReasonID, cancelReason) err2 := s.CancelWaybill(v, cancelReasonID, cancelReason)
if err2 == nil { if err2 == nil {
// 在这里就从map里删除，而不是等收到运单结束事件才删除，可避免不必要的重复取消（第二次取消还会失败） // 在这里就从map里删除，而不是等收到运单结束事件才删除，可避免不必要的重复取消（第二次取消还会失败）

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

@@ -67,7 +67,7 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int,
OrderCancelRole: 2, OrderCancelRole: 2,
} }
parameter.PartnerOrderCode = bill.VendorOrderID parameter.PartnerOrderCode = bill.VendorOrderID
fmt.Println("===============cancle", 3333)
if err = api.FnAPI.CancelOrder(parameter); err != nil { if err = api.FnAPI.CancelOrder(parameter); err != nil {
if strings.Contains(err.Error(), "运单暂未生成") { if strings.Contains(err.Error(), "运单暂未生成") {
err = nil err = nil