From f08893bff55dd4550a06c1976a550e67d81ca442 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Fri, 3 Nov 2023 15:48:53 +0800
Subject: [PATCH] 2

---
 api/controller/orderInquiry.go |  8 -----
 api/router/router.go           | 66 +++++++++++++++++++++++++++++-----
 2 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/api/controller/orderInquiry.go b/api/controller/orderInquiry.go
index 636fe5a..4e05fa4 100644
--- a/api/controller/orderInquiry.go
+++ b/api/controller/orderInquiry.go
@@ -263,14 +263,6 @@ func (r *OrderInquiry) GetOrderInquiryForAccountPage(c *gin.Context) {
 		req.PageSize = 20
 	}
 
-	doctorId := c.Param("doctor_id")
-	if doctorId == "" {
-		responses.FailWithMessage("缺少参数", c)
-		return
-	}
-
-	req.DoctorId = doctorId
-
 	orderInquiryDao := dao.OrderInquiryDao{}
 	orderInquiry, total, err := orderInquiryDao.GetOrderInquiryForAccountPageSearch(req, req.Page, req.PageSize)
 	if err != nil {
diff --git a/api/router/router.go b/api/router/router.go
index 14ce172..dc2aa7d 100644
--- a/api/router/router.go
+++ b/api/router/router.go
@@ -380,7 +380,7 @@ func privateRouter(r *gin.Engine, api controller.Api) {
 			accountGroup.GET("/:doctor_id", api.DoctorAccount.GetDoctorAccount)
 
 			// 获取医生账户关联订单列表-分页
-			accountGroup.GET("/order/:doctor_id", api.OrderInquiry.GetOrderInquiryForAccountPage)
+			accountGroup.GET("/order", api.OrderInquiry.GetOrderInquiryForAccountPage)
 		}
 	}
 
@@ -538,7 +538,7 @@ func privateRouter(r *gin.Engine, api controller.Api) {
 			withdrawalGroup.GET("/:withdrawal_id", api.DoctorWithdrawal.GetDoctorWithdrawal)
 
 			// 提现详情-关联订单列表-分页
-			withdrawalGroup.GET("/order/:withdrawal_id", api.DoctorWithdrawal.GetDoctorWithdrawalOrderPage)
+			withdrawalGroup.GET("/order", api.DoctorWithdrawal.GetDoctorWithdrawalOrderPage)
 
 			// 修改提现个人所得税
 			withdrawalGroup.PUT("/income/:withdrawal_id", api.DoctorWithdrawal.PutDoctorWithdrawalIncome)
@@ -592,10 +592,60 @@ func privateRouter(r *gin.Engine, api controller.Api) {
 		}
 	}
 
-	// 导出管理
-	exportGroup := adminGroup.Group("/export")
-	{
-		// 提现记录
-		exportGroup.PUT("/withdrawal", api.UserCaCert.RenewUserCloudCert)
-	}
+	// // 导出管理
+	// exportGroup := adminGroup.Group("/export")
+	// {
+	// 	// 提现
+	// 	withdrawalGroup := exportGroup.Group("/withdrawal")
+	// 	{
+	// 		// 提现记录
+	// 		withdrawalGroup.POST("", api.Export.DoctorWithdrawal)
+	//
+	// 		// 提现记录-关联订单
+	// 		withdrawalGroup.POST("/order", api.UserCaCert.RenewUserCloudCert)
+	// 	}
+	//
+	// 	// 医生
+	// 	doctorGroup := exportGroup.Group("/doctor")
+	// 	{
+	// 		// 医生列表
+	// 		doctorGroup.POST("", api.UserCaCert.RenewUserCloudCert)
+	//
+	// 		// 医生银行卡
+	// 		doctorGroup.POST("/bank/card", api.UserCaCert.RenewUserCloudCert)
+	//
+	// 		// 医生账户
+	// 		doctorGroup.POST("/account", api.UserCaCert.RenewUserCloudCert)
+	//
+	// 		// 医生账户-关联订单
+	// 		doctorGroup.POST("/account/order", api.UserCaCert.RenewUserCloudCert)
+	// 	}
+	//
+	// 	// 患者
+	// 	patientGroup := exportGroup.Group("/patient")
+	// 	{
+	// 		// 患者列表
+	// 		patientGroup.POST("", api.UserCaCert.RenewUserCloudCert)
+	//
+	// 		// 就诊人列表
+	// 		patientGroup.POST("/family", api.UserCaCert.RenewUserCloudCert)
+	// 	}
+	//
+	// 	// 订单
+	// 	orderGroup := exportGroup.Group("/order")
+	// 	{
+	// 		// 问诊订单
+	// 		orderGroup.POST("/inquiry", api.UserCaCert.RenewUserCloudCert)
+	//
+	// 		// 药品订单
+	// 		orderGroup.POST("/product", api.UserCaCert.RenewUserCloudCert)
+	// 	}
+	//
+	// 	// 处方
+	// 	prescriptionGroup := exportGroup.Group("/prescription")
+	// 	{
+	// 		// 处方
+	// 		prescriptionGroup.POST("", api.UserCaCert.RenewUserCloudCert)
+	// 	}
+	// }
 }