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-10-12 14:05:48 +08:00
parent 15f64bad0f
commit 6572f7b5ad
2 changed files with 44 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
business/jxstore/cms/system_store_sku.go
View File

@@ -49,31 +49,31 @@ func CopyOnStoreSkuToOther(ctx *jxcontext.Context, fromVendorStoreId, toStoreId
//} //}
case 2: case 2:
// 同步分类 // 同步分类
//fromCategoryList, _ := fromApi.RetailCatList(utils.Int2Str(fromVendorStoreId)) fromCategoryList, _ := fromApi.RetailCatList(utils.Int2Str(fromVendorStoreId))
//
//for _, v := range fromCategoryList { for _, v := range fromCategoryList {
// err := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{ err := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{
CategoryCode: v.Code,
Sequence: v.Sequence,
})
if err != nil {
globals.SugarLogger.Debugf("err := RetailCatUpdate : %s", utils.Format4Output(err, false))
}
if v.Children != nil && len(v.Children) != 0 {
for _, c := range v.Children {
if err := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{
CategoryNameOrigin: v.Name,
//CategoryCodeOrigin: v.Code,
//CategoryCode: v.Code, //CategoryCode: v.Code,
// Sequence: v.Sequence, SecondaryCategoryCode: c.Code,
// }) SecondaryCategoryName: c.Name,
// if err != nil { Sequence: c.Sequence,
// globals.SugarLogger.Debugf("err := RetailCatUpdate : %s", utils.Format4Output(err, false)) }); err != nil {
// } globals.SugarLogger.Debugf("err := RetailCatUpdate Children : %s", utils.Format4Output(c, false))
// if v.Children != nil && len(v.Children) != 0 { }
// for _, c := range v.Children { }
// if err := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{ }
// CategoryNameOrigin: v.Name, }
// //CategoryCodeOrigin: v.Code,
// //CategoryCode: v.Code,
// SecondaryCategoryCode: c.Code,
// SecondaryCategoryName: c.Name,
// Sequence: c.Sequence,
// }); err != nil {
// globals.SugarLogger.Debugf("err := RetailCatUpdate Children : %s", utils.Format4Output(c, false))
// }
// }
// }
//}
case 3: case 3:
i := offSet i := offSet

16
business/partner/purchase/ebai/order_afs.go
View File

@@ -307,12 +307,10 @@ func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.G
if err != nil { if err != nil {
return err return err
} }
if date == nil {
return fmt.Errorf("GetReverseOrder 饿百售后数据查询为空")
}
refundProductList := make([]*ebaiapi.RefundProductList, 0, 0) refundProductList := make([]*ebaiapi.RefundProductList, 0, 0)
removerAll := false removerAll := false
if date != nil && len(date) != model.NO {
for k, v := range date { for k, v := range date {
v2 := v.(map[string]interface{}) v2 := v.(map[string]interface{})
refundProduct := &ebaiapi.RefundProductList{ refundProduct := &ebaiapi.RefundProductList{
@@ -332,6 +330,7 @@ func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.G
refundProductList = append(refundProductList, refundProduct) refundProductList = append(refundProductList, refundProduct)
} }
param.RefundProductList = refundProductList param.RefundProductList = refundProductList
}
//售后部分多次退款 //售后部分多次退款
if removerAll { if removerAll {
@@ -340,17 +339,6 @@ func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.G
if reason == "" { if reason == "" {
return fmt.Errorf("拒绝退单时,请填写拒单原因") return fmt.Errorf("拒绝退单时,请填写拒单原因")
} }
//param := &ebaiapi.RefundOrderExamine{
// ReverseOrderId: afsOrderInfo.AfsOrderID,
// OrderId: afsOrderInfo.VendorOrderID,
// IdempotentId: utils.Int64ToStr(time.Now().UnixNano()),
// ActionType: ebaiapi.RefundTypeRefuse,
// ReasonCode: "7001",
// ReasonRemarks: reason,
// RefundProductList: "",
//}
//err = api.EbaiAPI.OrderPartRefund(param)
if err := api.EbaiAPI.OrderPartRefund(order.VendorOrderID, orderSkus2AfsSkus(refundSkuList)); err != nil { if err := api.EbaiAPI.OrderPartRefund(order.VendorOrderID, orderSkus2AfsSkus(refundSkuList)); err != nil {
return err return err
} }