f

app/main/api/internal/handler/admin_query_whitelist/adminquerywhitelistappendhandler.go

@@ -0,0 +1,29 @@
+package admin_query_whitelist
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"qnc-server/app/main/api/internal/logic/admin_query_whitelist"
+	"qnc-server/app/main/api/internal/svc"
+	"qnc-server/app/main/api/internal/types"
+	"qnc-server/common/result"
+	"qnc-server/pkg/lzkit/validator"
+)
+
+func AdminQueryWhitelistAppendHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.AdminQueryWhitelistAppendReq
+		if err := httpx.Parse(r, &req); err != nil {
+			result.ParamErrorResult(r, w, err)
+			return
+		}
+		if err := validator.Validate(req); err != nil {
+			result.ParamValidateErrorResult(r, w, err)
+			return
+		}
+		l := admin_query_whitelist.NewAdminQueryWhitelistAppendLogic(r.Context(), svcCtx)
+		resp, err := l.AdminQueryWhitelistAppend(&req)
+		result.HttpResult(r, w, resp, err)
+	}
+}

app/main/api/internal/handler/admin_query_whitelist/adminquerywhitelistcreatehandler.go

@@ -0,0 +1,29 @@
+package admin_query_whitelist
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"qnc-server/app/main/api/internal/logic/admin_query_whitelist"
+	"qnc-server/app/main/api/internal/svc"
+	"qnc-server/app/main/api/internal/types"
+	"qnc-server/common/result"
+	"qnc-server/pkg/lzkit/validator"
+)
+
+func AdminQueryWhitelistCreateHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.AdminQueryWhitelistCreateReq
+		if err := httpx.Parse(r, &req); err != nil {
+			result.ParamErrorResult(r, w, err)
+			return
+		}
+		if err := validator.Validate(req); err != nil {
+			result.ParamValidateErrorResult(r, w, err)
+			return
+		}
+		l := admin_query_whitelist.NewAdminQueryWhitelistCreateLogic(r.Context(), svcCtx)
+		resp, err := l.AdminQueryWhitelistCreate(&req)
+		result.HttpResult(r, w, resp, err)
+	}
+}

app/main/api/internal/handler/admin_query_whitelist/adminquerywhitelistoploglisthandler.go

@@ -0,0 +1,29 @@
+package admin_query_whitelist
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"qnc-server/app/main/api/internal/logic/admin_query_whitelist"
+	"qnc-server/app/main/api/internal/svc"
+	"qnc-server/app/main/api/internal/types"
+	"qnc-server/common/result"
+	"qnc-server/pkg/lzkit/validator"
+)
+
+func AdminQueryWhitelistOpLogListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.AdminQueryWhitelistOpLogListReq
+		if err := httpx.Parse(r, &req); err != nil {
+			result.ParamErrorResult(r, w, err)
+			return
+		}
+		if err := validator.Validate(req); err != nil {
+			result.ParamValidateErrorResult(r, w, err)
+			return
+		}
+		l := admin_query_whitelist.NewAdminQueryWhitelistOpLogListLogic(r.Context(), svcCtx)
+		resp, err := l.AdminQueryWhitelistOpLogList(&req)
+		result.HttpResult(r, w, resp, err)
+	}
+}

app/main/api/internal/handler/routes.go

@@ -15,6 +15,7 @@ import (
 	admin_platform_user "qnc-server/app/main/api/internal/handler/admin_platform_user"
 	admin_product "qnc-server/app/main/api/internal/handler/admin_product"
 	admin_query "qnc-server/app/main/api/internal/handler/admin_query"
+	admin_query_whitelist "qnc-server/app/main/api/internal/handler/admin_query_whitelist"
 	admin_role "qnc-server/app/main/api/internal/handler/admin_role"
 	admin_role_api "qnc-server/app/main/api/internal/handler/admin_role_api"
 	admin_user "qnc-server/app/main/api/internal/handler/admin_user"
@@ -368,18 +369,18 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 					Path:    "/retry-agent-process/:id",
 					Handler: admin_order.AdminRetryAgentProcessHandler(serverCtx),
 				},
-				{
-					// xpay补发货（查微信单并到账）
-					Method:  http.MethodPost,
-					Path:    "/xpay-deliver/:id",
-					Handler: admin_order.AdminXpayDeliverHandler(serverCtx),
-				},
 				{
 					// 更新订单
 					Method:  http.MethodPut,
 					Path:    "/update/:id",
 					Handler: admin_order.AdminUpdateOrderHandler(serverCtx),
 				},
+				{
+					// xpay补发货（查微信单并到账）
+					Method:  http.MethodPost,
+					Path:    "/xpay-deliver/:id",
+					Handler: admin_order.AdminXpayDeliverHandler(serverCtx),
+				},
 			}...,
 		),
 		rest.WithPrefix("/api/v1/admin/order"),
@@ -508,6 +509,33 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 		rest.WithPrefix("/api/v1/admin/query"),
 	)
 
+	server.AddRoutes(
+		rest.WithMiddlewares(
+			[]rest.Middleware{serverCtx.AdminAuthInterceptor},
+			[]rest.Route{
+				{
+					// 追加查询白名单产品编码
+					Method:  http.MethodPost,
+					Path:    "/append",
+					Handler: admin_query_whitelist.AdminQueryWhitelistAppendHandler(serverCtx),
+				},
+				{
+					// 创建查询白名单规则
+					Method:  http.MethodPost,
+					Path:    "/create",
+					Handler: admin_query_whitelist.AdminQueryWhitelistCreateHandler(serverCtx),
+				},
+				{
+					// 查询白名单操作记录列表
+					Method:  http.MethodGet,
+					Path:    "/op-log/list",
+					Handler: admin_query_whitelist.AdminQueryWhitelistOpLogListHandler(serverCtx),
+				},
+			}...,
+		),
+		rest.WithPrefix("/api/v1/admin/query-whitelist"),
+	)
+
 	server.AddRoutes(
 		rest.WithMiddlewares(
 			[]rest.Middleware{serverCtx.AdminAuthInterceptor},
@@ -851,13 +879,13 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			},
 			{
 				Method:  http.MethodGet,
-				Path:    "/app/version",
-				Handler: app.GetAppVersionHandler(serverCtx),
+				Path:    "/app/home/dynamic",
+				Handler: app.GetHomeDynamicDataHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodGet,
-				Path:    "/app/home/dynamic",
-				Handler: app.GetHomeDynamicDataHandler(serverCtx),
+				Path:    "/app/version",
+				Handler: app.GetAppVersionHandler(serverCtx),
 			},
 			{
 				// 心跳检测接口
@@ -945,12 +973,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			},
 			{
 				Method:  http.MethodGet,
-				Path:    "/pay/xpay/push",
-				Handler: pay.XpayPushHandler(serverCtx),
-			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/pay/xpay/push",
+				Path:    "/pay/xpay/pushpost/pay/xpay/push",
 				Handler: pay.XpayPushHandler(serverCtx),
 			},
 		},