From 703668d70db6efefb126b5d84f297a8e4c515e93 Mon Sep 17 00:00:00 2001
From: liangzai <2440983361@qq.com>
Date: Fri, 7 Mar 2025 03:52:12 +0800
Subject: [PATCH] fix

---
 .../agentwithdrawalhandler.go}                | 12 ++++----
 .../agent/getagentcommissionhandler.go        | 29 +++++++++++++++++++
 .../getagentrewardshandler.go}                | 12 ++++----
 .../agent/getagentwithdrawalhandler.go        | 29 +++++++++++++++++++
 4 files changed, 70 insertions(+), 12 deletions(-)
 rename app/user/cmd/api/internal/handler/{query/homeservicehandler.go => agent/agentwithdrawalhandler.go} (66%)
 create mode 100644 app/user/cmd/api/internal/handler/agent/getagentcommissionhandler.go
 rename app/user/cmd/api/internal/handler/{query/marriagehandler.go => agent/getagentrewardshandler.go} (66%)
 create mode 100644 app/user/cmd/api/internal/handler/agent/getagentwithdrawalhandler.go

diff --git a/app/user/cmd/api/internal/handler/query/homeservicehandler.go b/app/user/cmd/api/internal/handler/agent/agentwithdrawalhandler.go
similarity index 66%
rename from app/user/cmd/api/internal/handler/query/homeservicehandler.go
rename to app/user/cmd/api/internal/handler/agent/agentwithdrawalhandler.go
index 943e7aa..7434ee0 100644
--- a/app/user/cmd/api/internal/handler/query/homeservicehandler.go
+++ b/app/user/cmd/api/internal/handler/agent/agentwithdrawalhandler.go
@@ -1,19 +1,19 @@
-package query
+package agent
 
 import (
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
-	"tydata-server/app/user/cmd/api/internal/logic/query"
+	"tydata-server/app/user/cmd/api/internal/logic/agent"
 	"tydata-server/app/user/cmd/api/internal/svc"
 	"tydata-server/app/user/cmd/api/internal/types"
 	"tydata-server/common/result"
 	"tydata-server/pkg/lzkit/validator"
 )
 
-func HomeServiceHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+func AgentWithdrawalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.QueryReq
+		var req types.WithdrawalReq
 		if err := httpx.Parse(r, &req); err != nil {
 			result.ParamErrorResult(r, w, err)
 			return
@@ -22,8 +22,8 @@ func HomeServiceHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 			result.ParamValidateErrorResult(r, w, err)
 			return
 		}
-		l := query.NewHomeServiceLogic(r.Context(), svcCtx)
-		resp, err := l.HomeService(&req)
+		l := agent.NewAgentWithdrawalLogic(r.Context(), svcCtx)
+		resp, err := l.AgentWithdrawal(&req)
 		result.HttpResult(r, w, resp, err)
 	}
 }
diff --git a/app/user/cmd/api/internal/handler/agent/getagentcommissionhandler.go b/app/user/cmd/api/internal/handler/agent/getagentcommissionhandler.go
new file mode 100644
index 0000000..f602904
--- /dev/null
+++ b/app/user/cmd/api/internal/handler/agent/getagentcommissionhandler.go
@@ -0,0 +1,29 @@
+package agent
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"tydata-server/app/user/cmd/api/internal/logic/agent"
+	"tydata-server/app/user/cmd/api/internal/svc"
+	"tydata-server/app/user/cmd/api/internal/types"
+	"tydata-server/common/result"
+	"tydata-server/pkg/lzkit/validator"
+)
+
+func GetAgentCommissionHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.GetCommissionReq
+		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 := agent.NewGetAgentCommissionLogic(r.Context(), svcCtx)
+		resp, err := l.GetAgentCommission(&req)
+		result.HttpResult(r, w, resp, err)
+	}
+}
diff --git a/app/user/cmd/api/internal/handler/query/marriagehandler.go b/app/user/cmd/api/internal/handler/agent/getagentrewardshandler.go
similarity index 66%
rename from app/user/cmd/api/internal/handler/query/marriagehandler.go
rename to app/user/cmd/api/internal/handler/agent/getagentrewardshandler.go
index 006292d..d62fafd 100644
--- a/app/user/cmd/api/internal/handler/query/marriagehandler.go
+++ b/app/user/cmd/api/internal/handler/agent/getagentrewardshandler.go
@@ -1,19 +1,19 @@
-package query
+package agent
 
 import (
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
-	"tydata-server/app/user/cmd/api/internal/logic/query"
+	"tydata-server/app/user/cmd/api/internal/logic/agent"
 	"tydata-server/app/user/cmd/api/internal/svc"
 	"tydata-server/app/user/cmd/api/internal/types"
 	"tydata-server/common/result"
 	"tydata-server/pkg/lzkit/validator"
 )
 
-func MarriageHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+func GetAgentRewardsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.QueryReq
+		var req types.GetRewardsReq
 		if err := httpx.Parse(r, &req); err != nil {
 			result.ParamErrorResult(r, w, err)
 			return
@@ -22,8 +22,8 @@ func MarriageHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 			result.ParamValidateErrorResult(r, w, err)
 			return
 		}
-		l := query.NewMarriageLogic(r.Context(), svcCtx)
-		resp, err := l.Marriage(&req)
+		l := agent.NewGetAgentRewardsLogic(r.Context(), svcCtx)
+		resp, err := l.GetAgentRewards(&req)
 		result.HttpResult(r, w, resp, err)
 	}
 }
diff --git a/app/user/cmd/api/internal/handler/agent/getagentwithdrawalhandler.go b/app/user/cmd/api/internal/handler/agent/getagentwithdrawalhandler.go
new file mode 100644
index 0000000..a8ac5c1
--- /dev/null
+++ b/app/user/cmd/api/internal/handler/agent/getagentwithdrawalhandler.go
@@ -0,0 +1,29 @@
+package agent
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"tydata-server/app/user/cmd/api/internal/logic/agent"
+	"tydata-server/app/user/cmd/api/internal/svc"
+	"tydata-server/app/user/cmd/api/internal/types"
+	"tydata-server/common/result"
+	"tydata-server/pkg/lzkit/validator"
+)
+
+func GetAgentWithdrawalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.GetWithdrawalReq
+		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 := agent.NewGetAgentWithdrawalLogic(r.Context(), svcCtx)
+		resp, err := l.GetAgentWithdrawal(&req)
+		result.HttpResult(r, w, resp, err)
+	}
+}