From 5f6c739db97189ec5475ac35e734e159bf4e1d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 28 Oct 2022 18:26:08 +0800 Subject: [PATCH] 1 --- business/partner/partner.go | 7 +-- business/partner/purchase/ebai/order_afs.go | 3 ++ business/partner/purchase/mtwm/order_afs.go | 3 ++ .../purchase/tiktok_store/order_afs.go | 4 +- .../purchase/tiktok_store/store_sku2.go | 53 +++++++++---------- 5 files changed, 39 insertions(+), 31 deletions(-) diff --git a/business/partner/partner.go b/business/partner/partner.go index 63d4b1418..98a6fee64 100644 --- a/business/partner/partner.go +++ b/business/partner/partner.go @@ -27,9 +27,10 @@ const ( ) const ( - AfsApproveTypeRefund = 1 // 退款 - AfsApproveTypeReturnGoods = 2 // 退货 - AfsApproveTypeRefused = 3 // 驳回 + AfsApproveTypeRefund = 1 // 同意退款 + AfsApproveTypeReturnGoods = 2 // 退货退款 + AfsApproveTypeRefused = 3 // 驳回退款 + AfsApproveTypeRefusedToRefundMoney = 4 // 退货转退款 ) const ( diff --git a/business/partner/purchase/ebai/order_afs.go b/business/partner/purchase/ebai/order_afs.go index 9149dbfe2..33af86e67 100644 --- a/business/partner/purchase/ebai/order_afs.go +++ b/business/partner/purchase/ebai/order_afs.go @@ -1,6 +1,7 @@ package ebai import ( + "errors" "fmt" "strings" @@ -225,6 +226,8 @@ func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *mod if globals.EnableEbaiStoreWrite { if approveType == partner.AfsApproveTypeRefused { err = api.EbaiAPI.OrderDisagreeReturnGoods(order.VendorOrderID, order.AfsOrderID, reason) + } else if approveType == partner.AfsApproveTypeRefusedToRefundMoney { + return errors.New("此平台暂时不支持") } else { err = api.EbaiAPI.OrderAgreeReturnGoods(order.VendorOrderID, order.AfsOrderID) } diff --git a/business/partner/purchase/mtwm/order_afs.go b/business/partner/purchase/mtwm/order_afs.go index e68c3923c..ccbc1c9a8 100644 --- a/business/partner/purchase/mtwm/order_afs.go +++ b/business/partner/purchase/mtwm/order_afs.go @@ -1,6 +1,7 @@ package mtwm import ( + "errors" "fmt" "git.rosy.net.cn/jx-callback/globals/api" "net/url" @@ -196,6 +197,8 @@ func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *mod if globals.EnableMtwmStoreWrite { if approveType == partner.AfsApproveTypeRefused { err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromAfsOrder(order), order.VendorStoreID).OrderRefundReject(utils.Str2Int64(order.VendorOrderID), reason) + } else if approveType == partner.AfsApproveTypeRefusedToRefundMoney { + return errors.New("此平台暂时不支持") } else { err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromAfsOrder(order), order.VendorStoreID).OrderRefundAgree(utils.Str2Int64(order.VendorOrderID), reason) } diff --git a/business/partner/purchase/tiktok_store/order_afs.go b/business/partner/purchase/tiktok_store/order_afs.go index 51c2ffcb7..01d97f589 100644 --- a/business/partner/purchase/tiktok_store/order_afs.go +++ b/business/partner/purchase/tiktok_store/order_afs.go @@ -114,8 +114,10 @@ func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *mod if globals.EnableDdStoreWrite { if approveType == partner.AfsApproveTypeRefused { // 拒绝退货 err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuRefuseOnlyRefundApply, order.AfsOrderID, "拒绝退货", utils.Str2Int64(order.VendorStoreID)) - } else { + } else if approveType == partner.AfsApproveTypeRefund { // 同意 err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuAgreeOnlyRefundApply, order.AfsOrderID, "同意仅退款", utils.Str2Int64(order.VendorStoreID)) + } else if approveType == partner.AfsApproveTypeRefusedToRefundMoney { // 退货转退款 + err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuReturnGoodsToRefundApply, order.AfsOrderID, "退货转退款", utils.Str2Int64(order.VendorStoreID)) } } return err diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 623891586..f2371f4ba 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -225,31 +225,6 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr if len(childrenSku.SpecPrices) <= 0 { return nil, errors.New("子品商品详情获取失败") } - param := &sku_syncStock_request.SkuSyncStockParam{ - SkuId: childrenSku.SpecPrices[0].SkuId, - ProductId: utils.Str2Int64(v.VendorSkuID), - Incremental: false, - IdempotentId: "", - StockNum: 0, - OutWarehouseId: vendorStoreID, - } - if err := api.UpdateSkuStock(param); err != nil { - failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], fmt.Sprintf("下架商品异常,添加固定库存.%s", utils.Format4Output(param, false)))...) - } else { - failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], fmt.Sprintf("下架商品正常,添加固定库存.%s", utils.Format4Output(param, false)))...) - } - } - } else { // 上架 - for _, v := range storeSkuList { - - // 子品商品id获取skuId - childrenSku, err := api.GetSkuDetail(v.VendorSkuID, "") - if err != nil { - return nil, err - } - if len(childrenSku.SpecPrices) <= 0 { - return nil, errors.New("子品商品详情获取失败") - } param := &sku_syncStock_request.SkuSyncStockParam{ SkuId: childrenSku.SpecPrices[0].SkuId, @@ -260,9 +235,33 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr OutWarehouseId: vendorStoreID, } if err := api.UpdateSkuStock(param); err != nil { - failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], fmt.Sprintf("上架架商品异常,添加固定库存.%s", utils.Format4Output(param, false)))...) + failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], fmt.Sprintf("下架架商品异常,添加固定库存.%s", utils.Format4Output(param, false)))...) } else { - failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], fmt.Sprintf("上架架商品异常,添加固定库存.%s", utils.Format4Output(param, false)))...) + failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], fmt.Sprintf("下架商品异常,添加固定库存.%s", utils.Format4Output(param, false)))...) + } + } + } else { // 上架 + for _, v := range storeSkuList { + // 子品商品id获取skuId + childrenSku, err := api.GetSkuDetail(v.VendorSkuID, "") + if err != nil { + return nil, err + } + if len(childrenSku.SpecPrices) <= 0 { + return nil, errors.New("子品商品详情获取失败") + } + param := &sku_syncStock_request.SkuSyncStockParam{ + SkuId: childrenSku.SpecPrices[0].SkuId, + ProductId: utils.Str2Int64(v.VendorSkuID), + Incremental: false, + IdempotentId: "", + StockNum: 0, + OutWarehouseId: vendorStoreID, + } + if err := api.UpdateSkuStock(param); err != nil { + failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], fmt.Sprintf("上架商品异常,添加固定库存.%s", utils.Format4Output(param, false)))...) + } else { + failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], fmt.Sprintf("上架商品正常,添加固定库存.%s", utils.Format4Output(param, false)))...) } } }