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:
richboo111
2023-01-11 09:47:58 +08:00
parent c14956703d
commit d082e518a5
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) { func (c *BaseScheduler) CancelWaybill(bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
// 部分快递平台在取消成功后有时会不发运单取消消息过来（比如达达，904200512000442），为避免二次取消报错，添加状态判断 // 部分快递平台在取消成功后有时会不发运单取消消息过来（比如达达，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 handlerInfo := partner.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil {
if err = utils.CallFuncLogErrorWithInfo(func() error { if err = utils.CallFuncLogErrorWithInfo(func() error {
if err := handlerInfo.Handler.CancelWaybill(bill, cancelReasonID, cancelReason); err != nil { if err := handlerInfo.Handler.CancelWaybill(bill, cancelReasonID, cancelReason); err != nil {

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

@@ -1025,7 +1025,7 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2
savedOrderInfo.waybills[0] = &model.Waybill{ savedOrderInfo.waybills[0] = &model.Waybill{
VendorOrderID: savedOrderInfo.order.VendorOrderID, VendorOrderID: savedOrderInfo.order.VendorOrderID,
VendorWaybillID: savedOrderInfo.order.VendorWaybillID, VendorWaybillID: savedOrderInfo.order.VendorWaybillID,
WaybillVendorID: model.VendorIDDYPS, WaybillVendorID: model.VendorIDDD,
OrderVendorID: model.VendorIDDD, OrderVendorID: model.VendorIDDD,
} }
} }

1
business/model/const.go
View File

@@ -2,7 +2,6 @@ package model
import ( import (
"fmt" "fmt"
"git.rosy.net.cn/baseapi/platformapi/ebaiapi" "git.rosy.net.cn/baseapi/platformapi/ebaiapi"
"git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/platformapi/jdapi"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/platformapi/mtwmapi"

2
globals/globals.go
View File

@@ -102,7 +102,7 @@ func Init() {
SugarLogger.Infof("globals RunMode=%s", web.BConfig.RunMode) SugarLogger.Infof("globals RunMode=%s", web.BConfig.RunMode)
ReallyCallPlatformAPI = (web.BConfig.RunMode != "dev" && web.BConfig.RunMode != "test") ReallyCallPlatformAPI = (web.BConfig.RunMode != "dev" && web.BConfig.RunMode != "test")
//ReallyCallPlatformAPI = true//本地测试用 //ReallyCallPlatformAPI = true //本地测试用
ReallySendWeixinMsg = ReallyCallPlatformAPI && IsProductEnv() ReallySendWeixinMsg = ReallyCallPlatformAPI && IsProductEnv()
AliKey = web.AppConfig.DefaultString("aliKey", "") AliKey = web.AppConfig.DefaultString("aliKey", "")