新增后台微信退款，以及完善退款记录

app/main/api/internal/logic/pay/wechatpayrefundcallbacklogic.go

@@ -5,12 +5,14 @@ import (
 	"database/sql"
 	"net/http"
 	"qnc-server/app/main/api/internal/svc"
+	"qnc-server/app/main/model"
 	"strings"
 	"time"
 
 	"github.com/pkg/errors"
 	"github.com/wechatpay-apiv3/wechatpay-go/services/refunddomestic"
 	"github.com/zeromicro/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/stores/sqlx"
 )
 
 type WechatPayRefundCallbackLogic struct {
@@ -34,21 +36,71 @@ func (l *WechatPayRefundCallbackLogic) handleQueryOrderRefund(orderNo string, st
 		return errors.Wrapf(err, "查找查询订单信息失败: %s", orderNo)
 	}
 
-	if status == refunddomestic.STATUS_SUCCESS {
-		order.Status = "refunded"
-		order.RefundTime = sql.NullTime{
-			Time:  time.Now(),
-			Valid: true,
-		}
-	} else if status == refunddomestic.STATUS_ABNORMAL {
-		return nil // 异常状态直接返回
-	} else {
-		return nil // 其他状态直接返回
+	// 只处理成功和失败状态
+	var orderStatus, refundStatus string
+	switch status {
+	case refunddomestic.STATUS_SUCCESS:
+		orderStatus = model.OrderStatusRefunded
+		refundStatus = model.OrderRefundStatusSuccess
+	case refunddomestic.STATUS_CLOSED:
+		// 退款关闭，保持订单原状态，更新退款记录为失败
+		refundStatus = model.OrderRefundStatusFailed
+	case refunddomestic.STATUS_ABNORMAL:
+		// 退款异常，保持订单原状态，更新退款记录为失败
+		refundStatus = model.OrderRefundStatusFailed
+	default:
+		// 其他状态暂不处理
+		return nil
 	}
 
-	if err := l.svcCtx.OrderModel.UpdateWithVersion(l.ctx, nil, order); err != nil {
-		return errors.Wrapf(err, "更新查询订单状态失败: %s", orderNo)
+	// 使用事务同时更新订单和退款记录
+	err = l.svcCtx.OrderModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
+		// 更新订单状态（仅在退款成功时更新）
+		if status == refunddomestic.STATUS_SUCCESS {
+			order.Status = orderStatus
+			order.RefundTime = sql.NullTime{
+				Time:  time.Now(),
+				Valid: true,
+			}
+			if err := l.svcCtx.OrderModel.UpdateWithVersion(ctx, session, order); err != nil {
+				return errors.Wrapf(err, "更新查询订单状态失败: %s", orderNo)
+			}
+		}
+
+		// 更新退款记录状态
+		refund, err := l.svcCtx.OrderRefundModel.FindOneByOrderId(ctx, order.Id)
+		if err != nil {
+			if err == model.ErrNotFound {
+				logx.Errorf("未找到订单对应的退款记录: orderNo=%s, orderId=%d", orderNo, order.Id)
+				return nil // 没有退款记录时不报错，只记录警告
+			}
+			return errors.Wrapf(err, "查找退款记录失败: orderNo=%s", orderNo)
+		}
+
+		refund.Status = refundStatus
+		if status == refunddomestic.STATUS_SUCCESS {
+			refund.RefundTime = sql.NullTime{
+				Time:  time.Now(),
+				Valid: true,
+			}
+		} else if status == refunddomestic.STATUS_CLOSED {
+			refund.CloseTime = sql.NullTime{
+				Time:  time.Now(),
+				Valid: true,
+			}
+		}
+
+		if _, err := l.svcCtx.OrderRefundModel.Update(ctx, session, refund); err != nil {
+			return errors.Wrapf(err, "更新退款记录状态失败: orderNo=%s", orderNo)
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		return errors.Wrapf(err, "更新订单和退款记录失败: %s", orderNo)
 	}
+
 	return nil
 }