From 6f291dee6e1b754a7f9ff060d6e2115852bffd7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 31 Jul 2023 15:45:34 +0800 Subject: [PATCH] 1 --- .../purchase/tao_vegetable/order_afs.go | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/business/partner/purchase/tao_vegetable/order_afs.go b/business/partner/purchase/tao_vegetable/order_afs.go index d3764dd79..cea3acafa 100644 --- a/business/partner/purchase/tao_vegetable/order_afs.go +++ b/business/partner/purchase/tao_vegetable/order_afs.go @@ -147,15 +147,24 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal } afsOrder.SkuUserMoney += refundData.RefundFee - if afsOrder != nil { - //直接就来一个新的售后单,并且还是售后完成的 - if orderStatus.Status == model.AfsOrderStatusFinished { - afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt - } - orderStatus.RefVendorOrderID = afsOrder.VendorOrderID - orderStatus.VendorOrderID = afsOrder.AfsOrderID - err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus) + afs2, _ := partner.CurOrderManager.LoadAfsOrder(afsOrder.AfsOrderID, afsOrder.VendorID) + if afs2 != nil { + _, err = dao.DeleteEntity(db, afsOrder, "VendorOrderID", "AfsOrderID", "VendorID") + _, err = dao.DeleteEntity(db, &model.OrderSkuFinancial{ + VendorOrderID: afsOrder.VendorOrderID, + VendorID: afsOrder.VendorID, + IsAfsOrder: 1, + AfsOrderID: afsOrder.AfsOrderID, + }, "VendorOrderID", "VendorID", "IsAfsOrder", "AfsOrderID") + afsOrder.ReasonDesc += "(拒绝退款后,用户再次申请)" } + //直接就来一个新的售后单,并且还是售后完成的 + if orderStatus.Status == model.AfsOrderStatusFinished { + afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt + } + orderStatus.RefVendorOrderID = afsOrder.VendorOrderID + orderStatus.VendorOrderID = afsOrder.AfsOrderID + err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus) } case tao_vegetable.OrderStatusCancelAfs: @@ -483,12 +492,13 @@ func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *mod OrderFrom: utils.Int64ToPointer(utils.Str2Int64(tao_vegetable.TaoVegetableChannelCode)), } err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromAfsOrder(order), order.VendorStoreID).DisAgreeUserCancel(param) - //if err == nil { - // order.Status = model.AfsOrderStatusFailed - // order.VendorStatus = "老板拒绝" - // order.ReasonDesc += "," + reason - // dao.UpdateEntity(dao.GetDB(), order, "Status", "ReasonDesc", "VendorStatus") - //} + if err == nil { + order.Status = model.AfsOrderStatusFailed + order.VendorStatus = "老板拒绝" + order.Flag = model.AfsOrderFlagRefuseUserRefund + order.ReasonDesc += "," + reason + dao.UpdateEntity(dao.GetDB(), order, "Status", "ReasonDesc", "VendorStatus") + } } else if approveType == partner.AfsApproveTypeRefusedToRefundMoney { return errors.New("此平台暂时不支持") } else {