fix

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

@@ -45,6 +45,9 @@ func (l *WechatPayCallbackLogic) WechatPayCallback(w http.ResponseWriter, r *htt
 	} else if strings.HasPrefix(orderNo, "U_") {
 		// 代理升级订单处理
 		return l.handleAgentUpgradeOrderPayment(w, notification)
+	} else if strings.HasPrefix(orderNo, "W_") {
+		// 白名单下架订单处理
+		return l.handleWhitelistOrderPayment(w, notification)
 	} else if strings.HasPrefix(orderNo, "A_") {
 		// 旧系统会员充值订单（已废弃，新系统使用升级功能）
 		// return l.handleAgentVipOrderPayment(w, notification)
@@ -109,6 +112,91 @@ func (l *WechatPayCallbackLogic) handleQueryOrderPayment(w http.ResponseWriter,
 	return nil
 }
 
+// 处理白名单下架订单支付
+func (l *WechatPayCallbackLogic) handleWhitelistOrderPayment(w http.ResponseWriter, notification *payments.Transaction) error {
+	orderNo := *notification.OutTradeNo
+
+	// 1. 查找订单
+	order, findOrderErr := l.svcCtx.OrderModel.FindOneByOrderNo(l.ctx, orderNo)
+	if findOrderErr != nil {
+		logx.Errorf("微信白名单支付回调，查找订单信息失败: %+v", findOrderErr)
+		return nil
+	}
+
+	// 2. 验证金额
+	amount := lzUtils.ToWechatAmount(order.Amount)
+	if amount != *notification.Amount.Total {
+		logx.Errorf("微信白名单支付回调，金额不一致")
+		return nil
+	}
+
+	// 3. 检查订单状态
+	if order.Status != "pending" {
+		w.WriteHeader(http.StatusOK)
+		_, _ = w.Write([]byte("success"))
+		return nil
+	}
+
+	// 4. 查找白名单订单
+	whitelistOrder, findWhitelistErr := l.svcCtx.WhitelistOrderModel.FindOneByOrderNo(l.ctx, orderNo)
+	if findWhitelistErr != nil {
+		logx.Errorf("微信白名单支付回调，查找白名单订单失败，订单号: %s, 错误: %+v", orderNo, findWhitelistErr)
+		return nil
+	}
+	if whitelistOrder.Status != 1 {
+		// 白名单订单状态不是待支付，直接返回成功
+		w.WriteHeader(http.StatusOK)
+		_, _ = w.Write([]byte("success"))
+		return nil
+	}
+
+	// 5. 处理支付状态
+	switch *notification.TradeState {
+	case service.TradeStateSuccess:
+		order.Status = "paid"
+		order.PayTime = lzUtils.TimeToNullTime(time.Now())
+		order.PlatformOrderId = lzUtils.StringToNullString(*notification.TransactionId)
+		whitelistOrder.Status = 2 // 已支付
+		whitelistOrder.PayTime = lzUtils.TimeToNullTime(time.Now())
+	case service.TradeStateClosed:
+		order.Status = "closed"
+		order.CloseTime = lzUtils.TimeToNullTime(time.Now())
+		whitelistOrder.Status = 3 // 已取消
+	default:
+		return nil
+	}
+
+	// 6. 更新订单和白名单订单 + 创建白名单记录并删除报告数据
+	err := l.svcCtx.WhitelistOrderModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
+		// 6.1 更新订单状态
+		if updateErr := l.svcCtx.OrderModel.UpdateWithVersion(ctx, session, order); updateErr != nil {
+			return errors.Wrapf(updateErr, "微信白名单支付回调，更新订单状态失败")
+		}
+
+		// 6.2 更新白名单订单状态
+		if updateErr := l.svcCtx.WhitelistOrderModel.UpdateWithVersion(ctx, session, whitelistOrder); updateErr != nil {
+			return errors.Wrapf(updateErr, "微信白名单支付回调，更新白名单订单状态失败")
+		}
+
+		// 6.3 如果支付成功，调用 WhitelistService 处理白名单和报告数据
+		if whitelistOrder.Status == 2 {
+			if processErr := l.svcCtx.WhitelistService.ProcessPaidWhitelistOrder(ctx, session, order, whitelistOrder); processErr != nil {
+				return errors.Wrapf(processErr, "微信白名单支付回调，处理白名单订单失败")
+			}
+		}
+
+		return nil
+	})
+	if err != nil {
+		logx.Errorf("微信白名单支付回调，事务处理失败: %+v", err)
+		return nil
+	}
+
+	w.WriteHeader(http.StatusOK)
+	_, _ = w.Write([]byte("success"))
+	return nil
+}
+
 // 处理代理升级订单支付
 func (l *WechatPayCallbackLogic) handleAgentUpgradeOrderPayment(w http.ResponseWriter, notification *payments.Transaction) error {
 	orderNo := *notification.OutTradeNo