1

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 {

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,
 		}
 	}

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"

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", "")