Merge branch 'main' of http://1.117.67.95:3000/team/ycc-proxy-server

app/main/api/internal/logic/admin_query/admindeletequeryfeaturedatalogic.go

@@ -0,0 +1,51 @@
+package admin_query
+
+import (
+	"context"
+
+	"ycc-server/app/main/api/internal/svc"
+	"ycc-server/app/main/api/internal/types"
+	"ycc-server/common/xerr"
+
+	"github.com/pkg/errors"
+	"github.com/zeromicro/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/stores/sqlx"
+)
+
+type AdminDeleteQueryFeatureDataLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewAdminDeleteQueryFeatureDataLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminDeleteQueryFeatureDataLogic {
+	return &AdminDeleteQueryFeatureDataLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *AdminDeleteQueryFeatureDataLogic) AdminDeleteQueryFeatureData(req *types.AdminDeleteQueryFeatureDataReq) (resp *types.AdminDeleteQueryFeatureDataResp, err error) {
+	// 基本参数校验
+	if req.QueryId == "" {
+		return nil, errors.Wrapf(xerr.NewErrMsg("QueryId 不能为空"), "")
+	}
+	if req.FeatureApiId == "" {
+		return nil, errors.Wrapf(xerr.NewErrMsg("feature_api_id 不能为空"), "")
+	}
+
+	// 使用事务调用 WhitelistService.DeleteFeatureFromQueryData，保持与其它删除逻辑一致
+	err = l.svcCtx.QueryModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
+		return l.svcCtx.WhitelistService.DeleteFeatureFromQueryData(ctx, session, req.QueryId, req.FeatureApiId)
+	})
+	if err != nil {
+		l.Errorf("Admin 删除查询模块数据失败, queryId=%s, featureApiId=%s, err=%+v", req.QueryId, req.FeatureApiId, err)
+		return nil, errors.Wrapf(xerr.NewErrMsg("删除失败，请稍后重试"), "")
+	}
+
+	return &types.AdminDeleteQueryFeatureDataResp{
+		Success: true,
+		Message: "删除成功（如果原本不存在该模块数据，则视为已删除）",
+	}, nil
+}

app/main/api/internal/logic/agent/createwhitelistorderlogic.go

@@ -6,6 +6,7 @@ import (
 	"ycc-server/app/main/model"
 	"ycc-server/common/ctxdata"
 	"ycc-server/common/xerr"
+	"ycc-server/pkg/lzkit/lzUtils"
 
 	"github.com/google/uuid"
 	"github.com/pkg/errors"
@@ -123,6 +124,7 @@ func (l *CreateWhitelistOrderLogic) CreateWhitelistOrder(req *types.CreateWhitel
 			Id:          uuid.NewString(),
 			OrderNo:     orderNo,
 			UserId:      userID,
+			OrderId:     lzUtils.StringToNullString(req.OrderId), // 关联的查询订单ID（可选，用于后续支付回调精确删除报告）
 			IdCard:      req.IdCard,
 			TotalAmount: totalAmount,
 			Status:      1, // 待支付