fix and add

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

@@ -10,12 +10,73 @@ import (
 	"tydata-server/app/main/model"
 	"tydata-server/common/globalkey"
 
+	"github.com/Masterminds/squirrel"
 	"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"
 )
 
+// HandleCommissionAndWalletDeduction 处理退款后的佣金状态更新和钱包金额扣除
+// 这是一个公共函数，可以被支付宝和微信退款逻辑共享使用
+func HandleCommissionAndWalletDeduction(ctx context.Context, svcCtx *svc.ServiceContext, session sqlx.Session, order *model.Order) error {
+	// 查询非已退款的佣金
+	commissionBuilder := svcCtx.AgentCommissionModel.SelectBuilder()
+	commissions, commissionsErr := svcCtx.AgentCommissionModel.FindAll(ctx, commissionBuilder.Where(squirrel.And{
+		squirrel.Eq{"order_id": order.Id},
+		squirrel.NotEq{"status": 2}, // 只查询非已退款的佣金
+	}), "")
+	if commissionsErr != nil {
+		logx.Errorf("查询代理佣金失败，订单ID: %d, 错误: %v", order.Id, commissionsErr)
+		return nil // 返回 nil，因为佣金更新失败不应影响退款流程
+	}
+
+	for _, commission := range commissions {
+		commission.Status = 2 // 设置为已退款
+		// 更新佣金状态到数据库
+		var updateCommissionErr error
+		if session != nil {
+			updateCommissionErr = svcCtx.AgentCommissionModel.UpdateWithVersion(ctx, session, commission)
+		} else {
+			updateCommissionErr = svcCtx.AgentCommissionModel.UpdateWithVersion(ctx, nil, commission)
+		}
+		if updateCommissionErr != nil {
+			logx.Errorf("更新代理佣金状态失败，佣金ID: %d, 订单ID: %d, 错误: %v", commission.Id, order.Id, updateCommissionErr)
+			continue // 如果佣金状态更新失败，就不继续处理钱包
+		}
+
+		// 处理用户钱包的金额扣除
+		wallet, err := svcCtx.AgentWalletModel.FindOneByAgentId(ctx, commission.AgentId)
+		if err != nil {
+			logx.Errorf("查询代理钱包失败，代理ID: %d, 错误: %v", commission.AgentId, err)
+			continue
+		}
+
+		// 根据订单金额优先减少冻结金额，如果冻结金额不足则减少钱包余额
+		if wallet.FrozenBalance >= order.Amount {
+			// 冻结余额足够，优先减少冻结金额
+			wallet.FrozenBalance -= order.Amount
+		} else {
+			// 冻结余额不足，先扣减所有冻结金额，再扣减余额
+			remaining := order.Amount - wallet.FrozenBalance
+			wallet.FrozenBalance = 0
+			wallet.Balance -= remaining
+		}
+
+		var updateWalletErr error
+		if session != nil {
+			updateWalletErr = svcCtx.AgentWalletModel.UpdateWithVersion(ctx, session, wallet)
+		} else {
+			updateWalletErr = svcCtx.AgentWalletModel.UpdateWithVersion(ctx, nil, wallet)
+		}
+		if updateWalletErr != nil {
+			logx.Errorf("更新代理钱包失败，代理ID: %d, 错误: %v", commission.AgentId, updateWalletErr)
+			continue
+		}
+	}
+	return nil
+}
+
 type WechatPayRefundCallbackLogic struct {
 	logx.Logger
 	ctx    context.Context
@@ -72,6 +133,9 @@ func (l *WechatPayRefundCallbackLogic) handleQueryOrderRefund(orderNo string, st
 			if err := l.svcCtx.OrderModel.UpdateWithVersion(ctx, session, order); err != nil {
 				return errors.Wrapf(err, "更新查询订单状态失败: %s", orderNo)
 			}
+
+			// 退款成功时，更新代理佣金状态并扣除钱包金额
+			HandleCommissionAndWalletDeduction(ctx, l.svcCtx, session, order)
 		}
 
 		// 查找最新的pending状态的退款记录
@@ -174,7 +238,7 @@ func (l *WechatPayRefundCallbackLogic) WechatPayRefundCallback(w http.ResponseWr
 	var statusDetermined bool = false
 
 	if notification.Status != nil {
-	status = *notification.Status
+		status = *notification.Status
 		statusDetermined = true
 	} else if notification.SuccessTime != nil && !notification.SuccessTime.IsZero() {
 		// 如果Status为空但SuccessTime有值，说明退款成功