医生账户-关联订单-导出

api/controller/export.go

@@ -185,3 +185,37 @@ func (r *Export) DoctorAccount(c *gin.Context) {
 
 	responses.OkWithData(ossAddress, c)
 }
+
+// OrderInquiryForAccount 医生账户-关联订单
+func (r *Export) OrderInquiryForAccount(c *gin.Context) {
+	orderInquiryRequest := requests.OrderInquiryRequest{}
+	req := orderInquiryRequest.OrderInquiryForAccountExportList
+	if err := c.ShouldBind(&req); err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	// 参数验证
+	if err := global.Validate.Struct(req); err != nil {
+		responses.FailWithMessage(utils.Translate(err), c)
+		return
+	}
+
+	// 获取数据
+	orderInquiryDao := dao.OrderInquiryDao{}
+	orderInquirys, err := orderInquiryDao.GetOrderInquiryForAccountExportListSearch(req)
+	if err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	// 业务处理
+	exportService := service.ExportService{}
+	ossAddress, err := exportService.OrderInquiryForAccount(orderInquirys)
+	if err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	responses.OkWithData(ossAddress, c)
+}

api/controller/orderInquiry.go

@@ -9,7 +9,6 @@ import (
 	"hospital-admin-api/api/service"
 	"hospital-admin-api/global"
 	"hospital-admin-api/utils"
-	"math"
 	"strconv"
 )
 
@@ -278,39 +277,14 @@ func (r *OrderInquiry) GetOrderInquiryForAccountPage(c *gin.Context) {
 		return
 	}
 
+	orderInquiryService := service.OrderInquiryService{}
 	for _, v := range res {
 		// 处理入账状态（0:未入账 1:已入账 2:入账中 3:入账失败 4:入账取消）
-		// 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消）
-		if v.InquiryStatus == 7 {
-			entryStatus := 4
-			v.EntryStatus = &entryStatus
-		}
+		entryStatus := orderInquiryService.GetOrderInquiryEntryStatus(v.InquiryStatus, v.StatisticsStatus)
+		v.EntryStatus = &entryStatus
 
-		if v.InquiryStatus == 1 || v.InquiryStatus == 2 || v.InquiryStatus == 3 {
-			entryStatus := 0
-			v.EntryStatus = &entryStatus
-		}
-
-		if v.InquiryStatus == 4 || v.InquiryStatus == 5 {
-			entryStatus := 2
-			v.EntryStatus = &entryStatus
-			v.DoctorAmount = math.Floor(v.AmountTotal*0.75*100000) / 100000 // 医生收益
-		}
-
-		if v.InquiryStatus == 6 {
-			v.DoctorAmount = math.Floor(v.AmountTotal*0.75*100000) / 100000 // 医生收益
-
-			if v.StatisticsStatus == 1 {
-				entryStatus := 1
-				v.EntryStatus = &entryStatus
-			}
-
-			// 统计失败/已结束未统计
-			if v.StatisticsStatus == 2 || v.StatisticsStatus == 0 {
-				entryStatus := 3
-				v.EntryStatus = &entryStatus
-			}
-		}
+		// 处理医生收益
+		v.DoctorAmount = orderInquiryService.GetOrderInquiryDoctorAmount(v.InquiryStatus, v.AmountTotal)
 	}
 
 	result := make(map[string]interface{})