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

refund

Browse Source
This commit is contained in:
richboo111
2022-08-09 14:27:09 +08:00
parent d65f1066ea
commit 443505d322
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -220,12 +220,13 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(msg *ebaiapi.CallbackMsg) (order
return orderStatus return orderStatus
} }
// 审核售后单申请 // 审核售后单申请 全额退单
func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.AfsOrder, approveType int, reason string) (err error) { func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.AfsOrder, approveType int, reason string) (err error) {
if globals.EnableEbaiStoreWrite { if globals.EnableEbaiStoreWrite {
if approveType == partner.AfsApproveTypeRefused { if approveType == partner.AfsApproveTypeRefused {
err = api.EbaiAPI.OrderDisagreeReturnGoods(order.VendorOrderID, order.AfsOrderID, reason) err = api.EbaiAPI.OrderDisagreeReturnGoods(order.VendorOrderID, order.AfsOrderID, reason)
} else { } else {
err = api.EbaiAPI.OrderAgreeReturnGoods(order.VendorOrderID, order.AfsOrderID) err = api.EbaiAPI.OrderAgreeReturnGoods(order.VendorOrderID, order.AfsOrderID)
} }
} }
@@ -239,16 +240,21 @@ func (c *PurchaseHandler) ConfirmReceivedReturnGoods(ctx *jxcontext.Context, ord
} }
// 发起全款退款 // 发起全款退款
func (c *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) { func (c *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, afsOrder *model.AfsOrder, reason string) (err error) {
return c.PartRefundOrder(ctx, order, order.Skus, reason) //售后退单 部分/全部
if order.Status > model.OrderStatusEndBegin {
return c.PartRefundOrder(ctx, order, order.Skus, afsOrder, afsOrder.Skus, reason)
} else {
return c.PartRefundOrder(ctx, order, order.Skus, afsOrder, afsOrder.Skus, reason)
}
} }
// 发起部分退款 售后/售中 // 发起部分退款 售后/售中
func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, refundSkuList []*model.OrderSku, reason string) (err error) { func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, refundSkuList []*model.OrderSku, afsOrder *model.AfsOrder, refundSkuList2 []*model.OrderSkuFinancial, reason string) (err error) {
if globals.EnableEbaiStoreWrite { if globals.EnableEbaiStoreWrite {
//售后部分多次退款 //售后部分多次退款
if order.Status > model.OrderStatusEndBegin { if order.Status > model.OrderStatusEndBegin {
if err := api.EbaiAPI.OrderAgreePartRefund(order.VendorOrderID); err != nil { if err := api.EbaiAPI.OrderAgreePartRefund(afsOrder.VendorOrderID, orderSkus2AfsSkus(refundSkuList), afsOrder.AfsOrderID); err != nil {
return err return err
} }
} else { } else {

2
controllers/auth2.go
View File

@@ -256,7 +256,7 @@ func (c *Auth2Controller) WeixinMPOAuth2() {
// @Param state query string false "微信回调的登录状态" // @Param state query string false "微信回调的登录状态"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult
// @router pay [get] // @router /DingDingOAuth2 [get]
func (c *Auth2Controller) DingDingOAuth2() { func (c *Auth2Controller) DingDingOAuth2() {
var ( var (
redirectURL string redirectURL string