From e8c5c1498153048115fcbd604f810c5a9decdab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 27 Dec 2023 10:30:13 +0800 Subject: [PATCH] 1 --- .../jxcallback/scheduler/basesch/basesch.go | 4 ++-- .../partner/purchase/tiktok_store/order_afs.go | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go index dec6826f0..b15dc2e54 100644 --- a/business/jxcallback/scheduler/basesch/basesch.go +++ b/business/jxcallback/scheduler/basesch/basesch.go @@ -190,9 +190,9 @@ func (c *BaseScheduler) SelfDeliverDelivered(order *model.GoodsOrder, userName s order.Status <= model.OrderStatusDelivering { if c.IsReallyCallPlatformAPI { err = utils.CallFuncLogError(func() error { - if err = partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).SelfDeliverDelivered(order, userName); err != nil { + if err = partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).SelfDeliverDelivered(order, userName); err == nil { bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID) - if bill != nil && bill.WaybillVendorID != model.VendorJXFakeWL { + if bill != nil && bill.WaybillVendorID != model.VendorJXFakeWL && bill.WaybillVendorID != model.VendorIDUnknown { c.CancelWaybill(bill, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive) } } diff --git a/business/partner/purchase/tiktok_store/order_afs.go b/business/partner/purchase/tiktok_store/order_afs.go index b791f10d6..afd8c7b86 100644 --- a/business/partner/purchase/tiktok_store/order_afs.go +++ b/business/partner/purchase/tiktok_store/order_afs.go @@ -119,6 +119,13 @@ func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *mod //} if approveType == partner.AfsApproveTypeRefused { // 拒绝退货 + // tiktokShop.AfterSaleEmuRefuseToReturnOneApply + // tiktokShop.AfterSaleEmuRefuseToReturnTwoApply + // tiktokShop.AfterSaleEmuRefuseOnlyRefundApply + // tiktokShop.AfterSaleEmuRefundChangeGoodsOneApply + // tiktokShop.AfterSaleEmuRefundChangeGoodsTwoApply + // tiktokShop.AfterSaleEmuRefundReissueApply + //switch afsOrderDetail.Data.ProcessInfo.AfterSaleInfo.AfterSaleType { //case : // @@ -147,6 +154,16 @@ func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *mod } return fmt.Errorf("%s", strings.Join(errList, "--")) } else if approveType == partner.AfsApproveTypeRefund { // 同意 + // tiktokShop.AfterSaleEmuAgreeToReturnOneApply + // tiktokShop.AfterSaleEmuAgreeToReturnTwoApply + // tiktokShop.AfterSaleEmuReturnGoodsToRefundApply + // tiktokShop.AfterSaleEmuAgreeOnlyRefundApply + // tiktokShop.AfterSaleEmuAgreeChangeGoodsOneApply + // tiktokShop.AfterSaleEmuAgreeChangeGoodsTwoApply + // tiktokShop.AfterSaleEmuChangeGoodsToRefundApply + // tiktokShop.AfterSaleEmuAgreePreSaleReturnApply + // tiktokShop.AfterSaleEmuAgreeReissueApply + errList := make([]string, 0, 0) if err = tiktokApi.AfterSaleOperate(tiktokShop.AfterSaleEmuAgreeToReturnOneApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil { errList = append(errList, err.Error())