From d082e518a5876aeab7a89076ccd66d4f7c406f5b Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 11 Jan 2023 09:47:58 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/basesch/basesch.go | 3 ++- business/jxcallback/scheduler/defsch/defsch.go | 2 +- business/model/const.go | 1 - globals/globals.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go index 863c9a35c..51967440b 100644 --- a/business/jxcallback/scheduler/basesch/basesch.go +++ b/business/jxcallback/scheduler/basesch/basesch.go @@ -241,7 +241,8 @@ func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOr func (c *BaseScheduler) CancelWaybill(bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) { // 部分快递平台在取消成功后有时会不发运单取消消息过来（比如达达，904200512000442），为避免二次取消报错，添加状态判断 - if c.IsReallyCallPlatformAPI && bill.OrderVendorID != bill.WaybillVendorID && bill.Status != model.WaybillStatusCanceled { + if c.IsReallyCallPlatformAPI && bill.Status != model.WaybillStatusCanceled { //此行测试用 + //if c.IsReallyCallPlatformAPI && bill.OrderVendorID != bill.WaybillVendorID && bill.Status != model.WaybillStatusCanceled { if handlerInfo := partner.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil { if err = utils.CallFuncLogErrorWithInfo(func() error { if err := handlerInfo.Handler.CancelWaybill(bill, cancelReasonID, cancelReason); err != nil { diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 8414cddb2..8ef919a11 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -1025,7 +1025,7 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2 savedOrderInfo.waybills[0] = &model.Waybill{ VendorOrderID: savedOrderInfo.order.VendorOrderID, VendorWaybillID: savedOrderInfo.order.VendorWaybillID, - WaybillVendorID: model.VendorIDDYPS, + WaybillVendorID: model.VendorIDDD, OrderVendorID: model.VendorIDDD, } } diff --git a/business/model/const.go b/business/model/const.go index 30a567720..95d21c2e4 100644 --- a/business/model/const.go +++ b/business/model/const.go @@ -2,7 +2,6 @@ package model import ( "fmt" - "git.rosy.net.cn/baseapi/platformapi/ebaiapi" "git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/platformapi/mtwmapi" diff --git a/globals/globals.go b/globals/globals.go index 617c6c720..f7325f291 100644 --- a/globals/globals.go +++ b/globals/globals.go @@ -102,7 +102,7 @@ func Init() { SugarLogger.Infof("globals RunMode=%s", web.BConfig.RunMode) ReallyCallPlatformAPI = (web.BConfig.RunMode != "dev" && web.BConfig.RunMode != "test") - //ReallyCallPlatformAPI = true//本地测试用 + //ReallyCallPlatformAPI = true //本地测试用 ReallySendWeixinMsg = ReallyCallPlatformAPI && IsProductEnv() AliKey = web.AppConfig.DefaultString("aliKey", "")