From 259c479e72b224b4f1da4e292c74e4c3b6f15eab 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:24:47 +0800 Subject: [PATCH] 1 --- .../partner/purchase/tao_vegetable/order_afs.go | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/business/partner/purchase/tao_vegetable/order_afs.go b/business/partner/purchase/tao_vegetable/order_afs.go index 6e5e71678..d3764dd79 100644 --- a/business/partner/purchase/tao_vegetable/order_afs.go +++ b/business/partner/purchase/tao_vegetable/order_afs.go @@ -478,7 +478,7 @@ func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *mod db := dao.GetDB() if approveType == partner.AfsApproveTypeRefused { param := &request3156.AlibabaTclsAelophyRefundDisagreeRequest{ - RefundId: utils.String2Pointer(order.AfsOrderID), + RefundId: utils.String2Pointer(order.VendorOrderID2), RejectReason: utils.String2Pointer(reason), OrderFrom: utils.Int64ToPointer(utils.Str2Int64(tao_vegetable.TaoVegetableChannelCode)), } @@ -499,31 +499,18 @@ func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *mod param := &request3156.AlibabaTclsAelophyRefundAgreeRequest{ StoreId: utils.String2Pointer(order.VendorStoreID), OutOrderId: utils.String2Pointer(orderDetail.VendorOrderID2), - RefundId: utils.String2Pointer(order.AfsOrderID), + RefundId: utils.String2Pointer(order.VendorOrderID2), OrderFrom: utils.Int64ToPointer(utils.Str2Int64(tao_vegetable.TaoVegetableChannelCode)), } - // 加载购买商品 - //sku, _ := dao.GetSimpleOrderSkus(db, order.VendorOrderID, nil) - //skuCount := 0 - //for _, v := range sku { - // skuCount += v.Count - //} - //refundSkuCount := 0 subRefundList := make([]domain3156.AlibabaTclsAelophyRefundAgreeSubrefundlist, 0, len(afsSkuOrder)) for _, v := range afsSkuOrder { subRefundList = append(subRefundList, domain3156.AlibabaTclsAelophyRefundAgreeSubrefundlist{ OutSubOrderId: utils.String2Pointer(v.VendorSubOrderID), RefundFee: utils.Int64ToPointer(v.UserMoney), }) - //refundSkuCount += v.Count } - // 全退退运费 - //if skuCount == refundSkuCount { - // subRefundList[len(subRefundList)-1].RefundFee = utils.Int64ToPointer(*subRefundList[len(subRefundList)-1].RefundFee + orderDetail.BaseFreightMoney) - //} - param.SubRefundList = &subRefundList param.AuditMemo = utils.String2Pointer(fmt.Sprintf("商户同意退款")) if reason != "" {