f

app/main/api/internal/handler/admin_order/adminxpaydeliverhandler.go

@@ -1,9 +1,9 @@
-package pay
+package admin_order
 
 import (
 	"net/http"
 
-	"qnc-server/app/main/api/internal/logic/pay"
+	"qnc-server/app/main/api/internal/logic/admin_order"
 	"qnc-server/app/main/api/internal/svc"
 	"qnc-server/app/main/api/internal/types"
 	"qnc-server/common/result"
@@ -12,9 +12,9 @@ import (
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
-func XpayAdminDeliverHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+func AdminXpayDeliverHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.XpayAdminDeliverReq
+		var req types.AdminXpayDeliverReq
 		if err := httpx.Parse(r, &req); err != nil {
 			result.ParamErrorResult(r, w, err)
 			return
@@ -23,8 +23,8 @@ func XpayAdminDeliverHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 			result.ParamValidateErrorResult(r, w, err)
 			return
 		}
-		l := pay.NewXpayAdminDeliverLogic(r.Context(), svcCtx)
-		resp, err := l.XpayAdminDeliver(&req, r)
+		l := admin_order.NewAdminXpayDeliverLogic(r.Context(), svcCtx)
+		resp, err := l.AdminXpayDeliver(&req)
 		result.HttpResult(r, w, resp, err)
 	}
 }

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

@@ -368,6 +368,12 @@ 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,
@@ -947,11 +953,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/pay/xpay/push",
 				Handler: pay.XpayPushHandler(serverCtx),
 			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/pay/xpay/admin/deliver",
-				Handler: pay.XpayAdminDeliverHandler(serverCtx),
-			},
 		},
 		rest.WithPrefix("/api/v1"),
 	)