From 8daeacac837799b943f7a6843fa35563deb8f0bc Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 28 Dec 2022 15:31:15 +0800 Subject: [PATCH] 1 --- business/partner/delivery/tiktok_store/waybill.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/business/partner/delivery/tiktok_store/waybill.go b/business/partner/delivery/tiktok_store/waybill.go index f209aa8ce..f56f56be3 100644 --- a/business/partner/delivery/tiktok_store/waybill.go +++ b/business/partner/delivery/tiktok_store/waybill.go @@ -109,12 +109,11 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee } func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) { - err = getAPI(bill.VendorOrgCode).CancelPlatformPickUp(utils.Str2Int64(bill.VendorOrderID)) + err = getAPI(bill.VendorOrgCode).CancelPlatformPickUp(utils.Str2Int64(bill.VendorWaybillID)) bill.Status = model.WaybillStatusCanceled bill.Remark = cancelReason partner.CurOrderManager.OnWaybillStatusChanged(bill) - globals.SugarLogger.Debugf("DYPS CancelWaybill bill.Status=========%d", bill.Status) - globals.SugarLogger.Debugf("DYPS CancelWaybill err======%s", err) + globals.SugarLogger.Debugf("DYPS CancelWaybill bill.Status=%d err=%v", bill.Status, err) return err } @@ -132,7 +131,7 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf return deliveryFeeInfo, err } func getDispatcherFee(storeID int64, vendorOrderID string, dispatcherType int32) int64 { - if relInfo, err := dao.GetStoreDetail(dao.GetDB(), int(storeID), model.VendorIDDD, ""); err != nil { + if relInfo, err := dao.GetStoreDetailForDD(dao.GetDB(), 0, model.VendorIDDD, utils.Int64ToStr(storeID), ""); err != nil { return 0 } else { if dispatcherFee, err := getAPI(relInfo.VendorOrgCode).GetDispatcherInfo(storeID, vendorOrderID, dispatcherType); err == nil {