From 1d1f547c72eb4aa477e14fc550608227661ba88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 5 Jul 2023 15:46:58 +0800 Subject: [PATCH] 1 --- .../purchase/tao_vegetable/order_afs.go | 44 ++++++++++++------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/business/partner/purchase/tao_vegetable/order_afs.go b/business/partner/purchase/tao_vegetable/order_afs.go index 4033a7d41..2f5f94a0a 100644 --- a/business/partner/purchase/tao_vegetable/order_afs.go +++ b/business/partner/purchase/tao_vegetable/order_afs.go @@ -82,7 +82,6 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal ReasonType: 0, ReasonDesc: refundData.RefundReason, ReasonImgList: utils.LimitUTF8StringLen(refundData.RefundPictures, 1024), - RefundType: model.AfsTypeFullRefund, VendorOrgCode: api.GetVendorOrgCode(), } @@ -131,22 +130,37 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal if err != nil { return tao_vegetable.CallBackResultInfo(err) } - for _, sku := range *skuList.SubOrderResponseList { - orderSku := &model.OrderSkuFinancial{ - Count: utils.Float64TwoInt(*sku.BuySaleQuantity), - VendorSkuID: *sku.SkuCode, - SkuID: utils.Str2Int(*sku.SkuCode), - Name: *sku.SkuName, - UserMoney: *sku.OriginalFee - *sku.DiscountFee, - PmSkuSubsidyMoney: *sku.DiscountPlatformFee, // 平台补贴商品 - VendorOrderID: orderStatus.VendorOrderID, - VendorSubOrderID: *sku.OutSubOrderId, - } - afsOrder.PmSkuSubsidyMoney += orderSku.PmSkuSubsidyMoney - afsOrder.SkuUserMoney += orderSku.UserMoney - afsOrder.Skus = append(afsOrder.Skus, orderSku) + var refundSkuCount int64 = 0 + var orderSkuCount int64 = 0 + for _, refundSku := range refundData.SubRefundOrders { + refundSkuCount += refundSku.RefundAmount + for _, sku := range *skuList.SubOrderResponseList { + if refundSku.OutSubOrderId == *sku.OutSubOrderId { + orderSku := &model.OrderSkuFinancial{ + Count: utils.Float64TwoInt(*sku.BuySaleQuantity), + VendorSkuID: *sku.SkuCode, + SkuID: utils.Str2Int(*sku.SkuCode), + Name: *sku.SkuName, + UserMoney: *sku.OriginalFee - *sku.DiscountFee, + PmSkuSubsidyMoney: *sku.DiscountPlatformFee, // 平台补贴商品 + VendorOrderID: orderStatus.VendorOrderID, + VendorSubOrderID: *sku.OutSubOrderId, + } + + afsOrder.PmSkuSubsidyMoney += orderSku.PmSkuSubsidyMoney + afsOrder.SkuUserMoney += orderSku.UserMoney + afsOrder.Skus = append(afsOrder.Skus, orderSku) + orderSkuCount += utils.Float64TwoInt64(*sku.BuySaleQuantity) + } + } } + if refundSkuCount == orderSkuCount { + afsOrder.RefundType = model.AfsTypeFullRefund + } else { + afsOrder.RefundType = model.AfsTypePartRefund + } + if afsOrder != nil { //直接就来一个新的售后单,并且还是售后完成的 if orderStatus.Status == model.AfsOrderStatusFinished {