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:
邹宗楠
2023-12-27 10:30:13 +08:00
parent cc6a6c3c03
commit e8c5c14981
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)
}
}

17
business/partner/purchase/tiktok_store/order_afs.go
View File

@@ -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())