新增 获取账户关联问诊订单列表-分页
This commit is contained in:
parent
8cf0a1e8ab
commit
5113fab527
@ -239,3 +239,88 @@ func (r *OrderInquiry) GetOrderInquiryImPage(c *gin.Context) {
|
||||
responses.OkWithData(result, c)
|
||||
|
||||
}
|
||||
|
||||
// GetOrderInquiryForAccountPage 获取账户关联问诊订单列表-分页
|
||||
func (r *OrderInquiry) GetOrderInquiryForAccountPage(c *gin.Context) {
|
||||
orderInquiryRequest := requests.OrderInquiryRequest{}
|
||||
req := orderInquiryRequest.GetOrderInquiryForAccountPage
|
||||
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
|
||||
}
|
||||
|
||||
if req.Page == 0 {
|
||||
req.Page = 1
|
||||
}
|
||||
|
||||
if req.PageSize == 0 {
|
||||
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 {
|
||||
responses.FailWithMessage(err.Error(), c)
|
||||
return
|
||||
}
|
||||
|
||||
// 处理返回值
|
||||
res := dto.GetOrderInquiryForAccountListDto(orderInquiry)
|
||||
if err != nil {
|
||||
responses.FailWithMessage(err.Error(), c)
|
||||
return
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
if v.InquiryStatus == 6 {
|
||||
if v.StatisticsStatus == 1 {
|
||||
entryStatus := 1
|
||||
v.EntryStatus = &entryStatus
|
||||
}
|
||||
|
||||
// 统计失败/已结束未统计
|
||||
if v.StatisticsStatus == 2 || v.StatisticsStatus == 0 {
|
||||
entryStatus := 3
|
||||
v.EntryStatus = &entryStatus
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
result := make(map[string]interface{})
|
||||
result["page"] = req.Page
|
||||
result["page_size"] = req.PageSize
|
||||
result["total"] = total
|
||||
result["data"] = res
|
||||
responses.OkWithData(result, c)
|
||||
}
|
||||
|
||||
@ -483,3 +483,160 @@ func (r *OrderInquiryDao) GetOrderInquiryTimeList(maps interface{}, startTime, e
|
||||
}
|
||||
return m, nil
|
||||
}
|
||||
|
||||
// GetOrderInquiryForAccountPageSearch 获取账户关联问诊订单列表-分页
|
||||
func (r *OrderInquiryDao) GetOrderInquiryForAccountPageSearch(req requests.GetOrderInquiryForAccountPage, page, pageSize int) (m []*model.OrderInquiry, total int64, err error) {
|
||||
var totalRecords int64
|
||||
|
||||
// 构建查询条件
|
||||
query := global.Db.Model(&model.OrderInquiry{})
|
||||
|
||||
// 医生
|
||||
query = query.Preload("UserDoctor", func(db *gorm.DB) *gorm.DB {
|
||||
return db.Omit("open_id", "union_id", "wx_session_key")
|
||||
})
|
||||
|
||||
// 医生id
|
||||
if req.DoctorId != "" {
|
||||
query = query.Where("doctor_id = ?", req.DoctorId)
|
||||
}
|
||||
|
||||
// 问诊订单状态
|
||||
if req.InquiryStatus != nil {
|
||||
query = query.Where("inquiry_status = ?", req.InquiryStatus)
|
||||
}
|
||||
|
||||
// 系统订单编号
|
||||
if req.InquiryNo != "" {
|
||||
query = query.Where("inquiry_no = ?", req.InquiryNo)
|
||||
}
|
||||
|
||||
// 第三方支付流水号
|
||||
if req.EscrowTradeNo != "" {
|
||||
query = query.Where("escrow_trade_no = ?", req.EscrowTradeNo)
|
||||
}
|
||||
|
||||
// 支付时间
|
||||
if req.PayTime != "" {
|
||||
payTime := strings.Split(req.PayTime, "&")
|
||||
if len(payTime) == 2 {
|
||||
startTime, _ := time.Parse("2006-01-02", payTime[0])
|
||||
endTime, _ := time.Parse("2006-01-02", payTime[1])
|
||||
|
||||
if startTime == endTime {
|
||||
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
||||
}
|
||||
|
||||
query = query.Where("pay_time BETWEEN ? AND ?", startTime, endTime)
|
||||
}
|
||||
}
|
||||
|
||||
// 接诊时间
|
||||
if req.ReceptionTime != "" {
|
||||
receptionTime := strings.Split(req.ReceptionTime, "&")
|
||||
if len(receptionTime) == 2 {
|
||||
startTime, _ := time.Parse("2006-01-02", receptionTime[0])
|
||||
endTime, _ := time.Parse("2006-01-02", receptionTime[1])
|
||||
|
||||
if startTime == endTime {
|
||||
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
||||
}
|
||||
|
||||
query = query.Where("reception_time BETWEEN ? AND ?", startTime, endTime)
|
||||
}
|
||||
}
|
||||
|
||||
// 订单完成时间
|
||||
if req.CompleteTime != "" {
|
||||
completeTime := strings.Split(req.CompleteTime, "&")
|
||||
if len(completeTime) == 2 {
|
||||
startTime, _ := time.Parse("2006-01-02", completeTime[0])
|
||||
endTime, _ := time.Parse("2006-01-02", completeTime[1])
|
||||
|
||||
if startTime == endTime {
|
||||
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
||||
}
|
||||
|
||||
query = query.Where("complete_time BETWEEN ? AND ?", startTime, endTime)
|
||||
}
|
||||
}
|
||||
|
||||
// 订单结束时间
|
||||
if req.FinishTime != "" {
|
||||
finishTime := strings.Split(req.FinishTime, "&")
|
||||
if len(finishTime) == 2 {
|
||||
startTime, _ := time.Parse("2006-01-02", finishTime[0])
|
||||
endTime, _ := time.Parse("2006-01-02", finishTime[1])
|
||||
|
||||
if startTime == endTime {
|
||||
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
||||
}
|
||||
|
||||
query = query.Where("finish_time BETWEEN ? AND ?", startTime, endTime)
|
||||
}
|
||||
}
|
||||
|
||||
// 是否提现
|
||||
if req.IsWithdrawal != nil {
|
||||
query = query.Where("is_withdrawal = ?", req.IsWithdrawal)
|
||||
}
|
||||
|
||||
// 订单取消时间
|
||||
if req.CancelTime != "" {
|
||||
cancelTime := strings.Split(req.CancelTime, "&")
|
||||
if len(cancelTime) == 2 {
|
||||
startTime, _ := time.Parse("2006-01-02", cancelTime[0])
|
||||
endTime, _ := time.Parse("2006-01-02", cancelTime[1])
|
||||
|
||||
if startTime == endTime {
|
||||
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
||||
}
|
||||
|
||||
query = query.Where("cancel_time BETWEEN ? AND ?", startTime, endTime)
|
||||
}
|
||||
}
|
||||
|
||||
// 创建时间
|
||||
if req.CreatedAt != "" {
|
||||
createdAt := strings.Split(req.CreatedAt, "&")
|
||||
if len(createdAt) == 2 {
|
||||
startTime, _ := time.Parse("2006-01-02", createdAt[0])
|
||||
endTime, _ := time.Parse("2006-01-02", createdAt[1])
|
||||
|
||||
if startTime == endTime {
|
||||
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
||||
}
|
||||
|
||||
query = query.Where("created_at BETWEEN ? AND ?", startTime, endTime)
|
||||
}
|
||||
}
|
||||
|
||||
// 患者姓名-就诊人
|
||||
if req.PatientName != "" {
|
||||
query = query.Where("patient_name LIKE ?", "%"+req.PatientName+"%")
|
||||
}
|
||||
|
||||
// 手机号-医生/患者
|
||||
if req.Mobile != "" {
|
||||
// 患者
|
||||
subQuery := global.Db.Model(&model.User{}).
|
||||
Select("user_id").
|
||||
Where("mobile = ?", req.Mobile)
|
||||
|
||||
query = query.Where("user_id IN (?)", subQuery)
|
||||
}
|
||||
|
||||
// 排序
|
||||
query = query.Order("created_at desc")
|
||||
|
||||
// 查询总数量
|
||||
if err := query.Count(&totalRecords).Error; err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
err = query.Scopes(model.Paginate(page, pageSize)).Find(&m).Error
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
return m, totalRecords, nil
|
||||
}
|
||||
|
||||
@ -49,6 +49,7 @@ type OrderInquiryDto struct {
|
||||
OrderEvaluation *OrderEvaluationDto `json:"order_evaluation"` // 订单评价
|
||||
UserDoctor *UserDoctorDto `json:"user_doctor"` // 医生数据
|
||||
MessageIm []*MessageImDto `json:"message_im"` // 聊天记录
|
||||
EntryStatus *int `json:"entry_status"` // 入账状态（0:未入账 1:已入账 2:入账中 3:入账失败）
|
||||
}
|
||||
|
||||
// GetOrderInquiryDto 问诊订单详情
|
||||
@ -209,6 +210,62 @@ func GetOrderInquiryRecordListDto(m []*model.OrderInquiry) []*OrderInquiryDto {
|
||||
return responses
|
||||
}
|
||||
|
||||
// GetOrderInquiryForAccountListDto 账户关联问诊订单列表
|
||||
func GetOrderInquiryForAccountListDto(m []*model.OrderInquiry) []*OrderInquiryDto {
|
||||
// 处理返回值
|
||||
responses := make([]*OrderInquiryDto, len(m))
|
||||
|
||||
if len(m) > 0 {
|
||||
for i, v := range m {
|
||||
response := &OrderInquiryDto{
|
||||
OrderInquiryId: fmt.Sprintf("%d", v.OrderInquiryId),
|
||||
UserId: fmt.Sprintf("%d", v.UserId),
|
||||
PatientId: fmt.Sprintf("%d", v.PatientId),
|
||||
DoctorId: fmt.Sprintf("%d", v.DoctorId),
|
||||
FamilyId: fmt.Sprintf("%d", v.FamilyId),
|
||||
InquiryType: v.InquiryType,
|
||||
InquiryMode: v.InquiryMode,
|
||||
InquiryStatus: v.InquiryStatus,
|
||||
IsDelete: v.IsDelete,
|
||||
InquiryRefundStatus: v.InquiryRefundStatus,
|
||||
InquiryPayChannel: v.InquiryPayChannel,
|
||||
InquiryPayStatus: v.InquiryPayStatus,
|
||||
InquiryNo: v.InquiryNo,
|
||||
EscrowTradeNo: v.EscrowTradeNo,
|
||||
AmountTotal: v.AmountTotal,
|
||||
CouponAmountTotal: v.CouponAmountTotal,
|
||||
PaymentAmountTotal: v.PaymentAmountTotal,
|
||||
PayTime: v.PayTime,
|
||||
ReceptionTime: v.ReceptionTime,
|
||||
CompleteTime: v.CompleteTime,
|
||||
FinishTime: v.FinishTime,
|
||||
StatisticsStatus: v.StatisticsStatus,
|
||||
StatisticsTime: v.StatisticsTime,
|
||||
IsWithdrawal: v.IsWithdrawal,
|
||||
WithdrawalTime: v.WithdrawalTime,
|
||||
CancelTime: v.CancelTime,
|
||||
CancelReason: v.CancelReason,
|
||||
CancelRemarks: v.CancelRemarks,
|
||||
PatientNameMask: v.PatientNameMask,
|
||||
PatientSex: v.PatientSex,
|
||||
PatientAge: v.PatientAge,
|
||||
CreatedAt: v.CreatedAt,
|
||||
UpdatedAt: v.UpdatedAt,
|
||||
}
|
||||
|
||||
// 加载医生名称
|
||||
if v.UserDoctor != nil {
|
||||
response = response.LoadDoctorName(v.UserDoctor)
|
||||
}
|
||||
|
||||
// 将转换后的结构体添加到新切片中
|
||||
responses[i] = response
|
||||
}
|
||||
}
|
||||
|
||||
return responses
|
||||
}
|
||||
|
||||
// GetOrderInquiryRecordDto 问诊记录详情
|
||||
func GetOrderInquiryRecordDto(m *model.OrderInquiry) *OrderInquiryDto {
|
||||
var doctorId string
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
package requests
|
||||
|
||||
type OrderInquiryRequest struct {
|
||||
GetOrderInquiryPage // 获取问诊订单列表-分页
|
||||
CancelOrderInquiry // 取消问诊订单
|
||||
GetOrderInquiryRecordPage // 获取问诊记录列表-分页
|
||||
GetOrderInquiryImPage // 获取问诊订单im内容列表-分页
|
||||
GetOrderInquiryPage // 获取问诊订单列表-分页
|
||||
CancelOrderInquiry // 取消问诊订单
|
||||
GetOrderInquiryRecordPage // 获取问诊记录列表-分页
|
||||
GetOrderInquiryImPage // 获取问诊订单im内容列表-分页
|
||||
GetOrderInquiryForAccountPage // 获取账户关联问诊订单列表-分页
|
||||
}
|
||||
|
||||
// GetOrderInquiryPage 获取问诊订单列表-分页
|
||||
@ -66,3 +67,22 @@ type GetOrderInquiryImPage struct {
|
||||
PageSize int `json:"page_size" form:"page_size" label:"每页个数"`
|
||||
OrderInquiryId int64 `json:"order_inquiry_id" form:"order_inquiry_id" label:"订单id"`
|
||||
}
|
||||
|
||||
// GetOrderInquiryForAccountPage 获取账户关联问诊订单列表-分页
|
||||
type GetOrderInquiryForAccountPage struct {
|
||||
Page int `json:"page" form:"page" label:"页码"`
|
||||
PageSize int `json:"page_size" form:"page_size" label:"每页个数"`
|
||||
DoctorId string `json:"doctor_id" form:"doctor_id" label:"医生id"`
|
||||
InquiryNo string `json:"inquiry_no" form:"inquiry_no" label:"系统订单编号"`
|
||||
EscrowTradeNo string `json:"escrow_trade_no" form:"escrow_trade_no" label:"第三方支付流水号"`
|
||||
PatientName string `json:"patient_name" form:"patient_name" label:"患者姓名-就诊人"`
|
||||
Mobile string `json:"mobile" form:"mobile" label:"手机号-患者"`
|
||||
InquiryStatus *int `json:"inquiry_status" form:"inquiry_status" label:"问诊订单状态"` // 1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消
|
||||
PayTime string `json:"pay_time" form:"pay_time" label:"支付时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
|
||||
ReceptionTime string `json:"reception_time" form:"reception_time" label:"接诊时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
|
||||
CompleteTime string `json:"complete_time" form:"complete_time" label:"订单完成时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
|
||||
FinishTime string `json:"finish_time" form:"finish_time" label:"订单结束时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
|
||||
IsWithdrawal *int `json:"is_withdrawal" form:"is_withdrawal" label:"是否提现"` // 0:否 1:是 2:提现中
|
||||
CancelTime string `json:"cancel_time" form:"cancel_time" label:"订单取消时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
|
||||
CreatedAt string `json:"created_at" form:"created_at" label:"订单创建时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
|
||||
}
|
||||
|
||||
@ -379,8 +379,8 @@ func privateRouter(r *gin.Engine, api controller.Api) {
|
||||
// 医生账户详情
|
||||
accountGroup.GET("/:doctor_id", api.DoctorAccount.GetDoctorAccount)
|
||||
|
||||
// 获取医生账户订单列表-分页
|
||||
accountGroup.GET("/order/:doctor_id", api.DoctorWithdrawal.GetDoctorWithdrawalOrderPage)
|
||||
// 获取医生账户关联订单列表-分页
|
||||
accountGroup.GET("/order/:doctor_id", api.OrderInquiry.GetOrderInquiryForAccountPage)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user