1

business/partner/partner.go

@@ -27,9 +27,10 @@ const (
 )
 
 const (
-	AfsApproveTypeRefund      = 1 // 退款
+	AfsApproveTypeRefund               = 1 // 同意退款
-	AfsApproveTypeReturnGoods = 2 // 退货
+	AfsApproveTypeReturnGoods          = 2 // 退货退款
-	AfsApproveTypeRefused     = 3 // 驳回
+	AfsApproveTypeRefused              = 3 // 驳回退款
+	AfsApproveTypeRefusedToRefundMoney = 4 // 退货转退款
 )
 
 const (

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

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

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

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