This commit is contained in:
2026-02-06 13:34:49 +08:00
parent 9648fcd1ec
commit dc4fcbf857
12 changed files with 1796 additions and 757 deletions

View File

@@ -75,10 +75,13 @@ func (l *AdminRefundOrderLogic) getAndValidateOrder(orderId int64, refundAmount
return order, nil
}
// handleAlipayRefund 处理支付宝退款
// handleAlipayRefund 处理支付宝退款2026-02-02 18:26 前的订单走 bak 商户号)
func (l *AdminRefundOrderLogic) handleAlipayRefund(order *model.Order, req *types.AdminRefundOrderReq) (*types.AdminRefundOrderResp, error) {
// 调用支付宝退款接口
refundResp, err := l.svcCtx.AlipayService.AliRefund(l.ctx, order.OrderNo, req.RefundAmount)
orderPayTime := &order.CreateTime
if order.PayTime.Valid {
orderPayTime = &order.PayTime.Time
}
refundResp, err := l.svcCtx.AlipayService.AliRefund(l.ctx, order.OrderNo, req.RefundAmount, orderPayTime)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "AdminRefundOrder, 支付宝退款失败 err: %v", err)
}

View File

@@ -218,7 +218,9 @@ func (l *AlipayCallbackLogic) handleRefund(order *model.AgentMembershipRechargeO
return refundErr
}
} else {
refund, refundErr := l.svcCtx.AlipayService.AliRefund(ctx, order.OrderNo, order.Amount)
// 代理会员订单以创建时间为准2026-02-02 18:26 前的订单走 bak 商户号
orderPayTime := order.CreateTime
refund, refundErr := l.svcCtx.AlipayService.AliRefund(ctx, order.OrderNo, order.Amount, &orderPayTime)
if refundErr != nil {
return refundErr
}

View File

@@ -221,7 +221,9 @@ func (l *WechatPayCallbackLogic) handleRefund(order *model.AgentMembershipRechar
return refundErr
}
} else {
refund, refundErr := l.svcCtx.AlipayService.AliRefund(ctx, order.OrderNo, order.Amount)
// 代理会员订单以创建时间为准2026-02-02 18:26 前的订单走 bak 商户号
orderPayTime := order.CreateTime
refund, refundErr := l.svcCtx.AlipayService.AliRefund(ctx, order.OrderNo, order.Amount, &orderPayTime)
if refundErr != nil {
return refundErr
}

File diff suppressed because it is too large Load Diff