新增了服务包订单导出、商品列表增加了商品id搜索条件

This commit is contained in:
2024-06-05 15:27:33 +08:00
parent ca629cdb2d
commit d76c00556c
9 changed files with 507 additions and 2 deletions
+215
View File
@@ -1,6 +1,7 @@
package dao
import (
"errors"
"gorm.io/gorm"
"gorm.io/gorm/clause"
"hospital-admin-api/api/model"
@@ -291,3 +292,217 @@ func (r *OrderServicePackageDao) GetOrderServicePackagePageSearch(req requests.G
}
return m, totalRecords, nil
}
// GetOrderServicePackageExportListSearch 获取服务包订单列表-导出
func (r *OrderServicePackageDao) GetOrderServicePackageExportListSearch(req requests.OrderServicePackageExportList) (m []*model.OrderServicePackage, err error) {
// 构建查询条件
query := global.Db.Model(&model.OrderServicePackage{})
// 医生
query = query.Preload("UserDoctor", func(db *gorm.DB) *gorm.DB {
return db.Omit("open_id", "union_id", "wx_session_key")
})
// 用户
query = query.Preload("User", func(db *gorm.DB) *gorm.DB {
return db.Select("user_id", "user_name", "mobile")
})
// 患者
query = query.Preload("UserPatient.User", func(db *gorm.DB) *gorm.DB {
return db.Select("user_id", "user_name", "mobile")
})
// 当前搜索数据
if req.Type == 1 {
// 医生姓名
if req.DoctorName != "" {
subQuery := global.Db.Model(&model.UserDoctor{}).
Select("doctor_id").
Where("user_name LIKE ?", "%"+req.DoctorName+"%")
query = query.Where(gorm.Expr("doctor_id IN (?)", subQuery))
}
// 订单id
if req.OrderId != "" {
query = query.Where("order_id = ?", req.OrderId)
}
// 服务包类型
if req.OrderServiceType != nil {
query = query.Where("order_service_type = ?", req.OrderServiceType)
}
// 订单状态
if req.OrderServiceStatus != nil {
query = query.Where("order_service_status = ?", req.OrderServiceStatus)
}
// 删除状态
if req.OrderServiceStatus != nil {
query = query.Where("order_service_status = ?", req.OrderServiceStatus)
}
// 订单退款状态
if req.RefundStatus != nil {
query = query.Where("refund_status = ?", req.RefundStatus)
}
// 支付渠道
if req.PayChannel != nil {
query = query.Where("pay_channel = ?", req.PayChannel)
}
// 支付状态
if req.PayStatus != nil {
query = query.Where("pay_status = ?", req.PayStatus)
}
// 系统订单编号
if req.OrderServiceNo != "" {
query = query.Where("order_service_no = ?", req.OrderServiceNo)
}
// 第三方支付流水号
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])
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
query = query.Where("pay_time BETWEEN ? AND ?", startTime, endTime)
}
}
// 开始服务时间
if req.StartTime != "" {
orderStartTime := strings.Split(req.StartTime, "&")
if len(orderStartTime) == 2 {
startTime, _ := time.Parse("2006-01-02", orderStartTime[0])
endTime, _ := time.Parse("2006-01-02", orderStartTime[1])
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
query = query.Where("start_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])
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
query = query.Where("finish_time BETWEEN ? AND ?", startTime, endTime)
}
}
// 订单取消时间
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])
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
query = query.Where("cancel_time BETWEEN ? AND ?", startTime, endTime)
}
}
// 取消订单原因
if req.CancelReason != nil {
query = query.Where("cancel_reason = ?", req.CancelReason)
}
// 取消订单备注
if req.CancelRemarks != "" {
query = query.Where("cancel_remarks LIKE ?", "%"+req.CancelRemarks+"%")
}
// 添加完成订单延迟队列状态
if req.AddFinishStatus != nil {
query = query.Where("add_finish_status = ?", req.AddFinishStatus)
}
// 添加完成订单延迟队列时间
if req.AddFinishTime != "" {
addFinishTime := strings.Split(req.AddFinishTime, "&")
if len(addFinishTime) == 2 {
startTime, _ := time.Parse("2006-01-02", addFinishTime[0])
endTime, _ := time.Parse("2006-01-02", addFinishTime[1])
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
query = query.Where("add_finish_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])
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 != "" {
// 患者
patientSubQuery := global.Db.Model(&model.User{}).
Select("user_id").
Where("mobile = ?", req.Mobile)
// 医生
doctorUserSubQuery := global.Db.Model(&model.User{}).
Select("user_id").
Where("mobile = ?", req.Mobile)
doctorSubQuery := global.Db.Model(&model.UserDoctor{}).
Select("doctor_id").
Where(gorm.Expr("user_id IN (?)", doctorUserSubQuery))
query = query.Where("user_id IN (?)", patientSubQuery).Or("doctor_id IN (?)", doctorSubQuery)
}
}
// 当前选中数据
if req.Type == 2 {
if req.Id == "" {
return nil, errors.New("未提供需导出数据编号")
}
id := strings.Split(req.Id, ",")
query = query.Where("order_service_id IN (?)", id)
}
// 排序
query = query.Order("created_at desc")
err = query.Find(&m).Error
if err != nil {
return nil, err
}
return m, nil
}
+5
View File
@@ -269,6 +269,11 @@ func (r *ProductDao) GetProductListSearch(req requests.GetProductList) (m []*mod
return db.Select("amount_id", "product_platform_id", "product_platform_code", "stock")
})
// 商品id
if req.ProductId != "" {
query = query.Where("product_id = ?", req.ProductId)
}
// 商品名称
if req.ProductName != "" {
query = query.Where("product_name LIKE ?", "%"+req.ProductName+"%")