liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
邹宗楠
2022-08-11 13:47:24 +08:00
parent f6c85867ab 56bed3d517
commit 5c8bc4610e
7 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/partner/purchase/ebai/order.go
View File

@@ -641,12 +641,7 @@ func (c *PurchaseHandler) GetOrderRealMobile(ctx *jxcontext.Context, order *mode
func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *model.GoodsOrder, isAgree bool, reason string) (err error) {
if globals.EnableEbaiStoreWrite {
if isAgree {
//售后同意多次取消
if order.Status > model.OrderStatusEndBegin {
err = api.EbaiAPI.OrderAgreePartRefund(order.VendorOrderID)
} else {
err = api.EbaiAPI.OrderAgreeRefund(order.VendorOrderID)
}
err = api.EbaiAPI.OrderAgreeRefund(order.VendorOrderID)
} else {
err = api.EbaiAPI.OrderDisagreeRefund(order.VendorOrderID, reason)
}

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

@@ -220,7 +220,7 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(msg *ebaiapi.CallbackMsg) (order
return orderStatus
}
// 审核售后单申请
// 审核售后单申请 退货退款
func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.AfsOrder, approveType int, reason string) (err error) {
if globals.EnableEbaiStoreWrite {
if approveType == partner.AfsApproveTypeRefused {
@@ -240,6 +240,7 @@ func (c *PurchaseHandler) ConfirmReceivedReturnGoods(ctx *jxcontext.Context, ord
// 发起全款退款
func (c *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
//售后退单 部分/全部
return c.PartRefundOrder(ctx, order, order.Skus, reason)
}
@@ -248,7 +249,14 @@ func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.G
if globals.EnableEbaiStoreWrite {
//售后部分多次退款
if order.Status > model.OrderStatusEndBegin {
if err := api.EbaiAPI.OrderAgreePartRefund(order.VendorOrderID); err != nil {
//获取afsOrder
var afsOrderInfo *model.AfsOrder
result, err := api.EbaiAPI.OrderPartRefundGet(order.VendorOrderID)
if err != nil {
return err
}
afsOrderInfo = CurPurchaseHandler.AfsOrderDetail2Financial(result)
if err := api.EbaiAPI.OrderAgreePartRefund(afsOrderInfo.VendorOrderID, orderSkus2AfsSkus(refundSkuList), afsOrderInfo.AfsOrderID); err != nil {
return err
}
} else {

5
business/partner/purchase/ebai/store_sku2.go
View File

@@ -510,6 +510,11 @@ func genSkuParamsFromStoreSkuInfo2(storeSku *dao.StoreSkuSyncInfo, isCreate, isE
// if storeSku.Upc != "" {
// params["upc"] = storeSku.Upc
// }
//测试ebai 目前未考虑称重商品
if storeSku.MinOrderCount > 0 {
params["minimum"] = utils.Int2Float64(storeSku.MinOrderCount)
}
return params
}