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

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

@@ -49,31 +49,31 @@ func CopyOnStoreSkuToOther(ctx *jxcontext.Context, fromVendorStoreId, toStoreId
//}
case 2:
// 同步分类
//fromCategoryList, _ := fromApi.RetailCatList(utils.Int2Str(fromVendorStoreId))
//
//for _, v := range fromCategoryList {
// 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,
// SecondaryCategoryCode: c.Code,
// SecondaryCategoryName: c.Name,
// Sequence: c.Sequence,
// }); err != nil {
// globals.SugarLogger.Debugf("err := RetailCatUpdate Children : %s", utils.Format4Output(c, false))
// }
// }
// }
//}
fromCategoryList, _ := fromApi.RetailCatList(utils.Int2Str(fromVendorStoreId))
for _, v := range fromCategoryList {
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,
SecondaryCategoryCode: c.Code,
SecondaryCategoryName: c.Name,
Sequence: c.Sequence,
}); err != nil {
globals.SugarLogger.Debugf("err := RetailCatUpdate Children : %s", utils.Format4Output(c, false))
}
}
}
}
case 3:
i := offSet

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

@@ -307,31 +307,30 @@ func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.G
if err != nil {
return err
}
if date == nil {
return fmt.Errorf("GetReverseOrder 饿百售后数据查询为空")
}
refundProductList := make([]*ebaiapi.RefundProductList, 0, 0)
removerAll := false
for k, v := range date {
v2 := v.(map[string]interface{})
refundProduct := &ebaiapi.RefundProductList{
SubBizOrderId: v2["sub_biz_order_id"].(string),
PlatformSkuId: utils.Int64ToStr(utils.Interface2Int64WithDefault(v2["platform_sku_id"], 0)),
if date != nil && len(date) != model.NO {
for k, v := range date {
v2 := v.(map[string]interface{})
refundProduct := &ebaiapi.RefundProductList{
SubBizOrderId: v2["sub_biz_order_id"].(string),
PlatformSkuId: utils.Int64ToStr(utils.Interface2Int64WithDefault(v2["platform_sku_id"], 0)),
}
// 全退
if k == model.NO && utils.MustInterface2Int64(v2["is_refund_all"]) == model.YES {
removerAll = true
}
switch utils.MustInterface2Int64(v2["fund_calculate_type"]) {
case 0:
refundProduct.Number = utils.Int64ToStr(utils.MustInterface2Int64(v2["refund_quantity"]))
case 1:
refundProduct.RefundAmount = utils.Int64ToStr(utils.MustInterface2Int64(v2["refund_user_amount"]))
}
refundProductList = append(refundProductList, refundProduct)
}
// 全退
if k == model.NO && utils.MustInterface2Int64(v2["is_refund_all"]) == model.YES {
removerAll = true
}
switch utils.MustInterface2Int64(v2["fund_calculate_type"]) {
case 0:
refundProduct.Number = utils.Int64ToStr(utils.MustInterface2Int64(v2["refund_quantity"]))
case 1:
refundProduct.RefundAmount = utils.Int64ToStr(utils.MustInterface2Int64(v2["refund_user_amount"]))
}
refundProductList = append(refundProductList, refundProduct)
param.RefundProductList = refundProductList
}
param.RefundProductList = refundProductList
//售后部分多次退款
if removerAll {
@@ -340,17 +339,6 @@ func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.G
if reason == "" {
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 {
return err
}