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

This commit is contained in:
wucongxing8150 2024-06-05 15:27:33 +08:00
parent ca629cdb2d
commit d76c00556c
9 changed files with 507 additions and 2 deletions

View File

@ -594,3 +594,52 @@ func (r *Export) Product(c *gin.Context) {
responses.OkWithData(ossAddress, c)
}
// OrderService 服务包订单
func (r *Export) OrderService(c *gin.Context) {
orderServicePackageRequest := requests.OrderServicePackageRequest{}
req := orderServicePackageRequest.OrderServicePackageExportList
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
}
// 获取数据
orderServicePackageDao := dao.OrderServicePackageDao{}
orderServicePackage, err := orderServicePackageDao.GetOrderServicePackageExportListSearch(req)
if err != nil {
responses.FailWithMessage(err.Error(), c)
return
}
// 业务处理
exportService := service.ExportService{}
ossAddress, err := exportService.OrderServicePackage(orderServicePackage)
if err != nil {
responses.FailWithMessage(err.Error(), c)
return
}
// 获取当前登陆用户id
userId := c.GetInt64("UserId")
if userId != 0 {
// 记录日志
logExport := &model.LogExport{
AdminUserId: userId,
ExportModule: "服务包订单",
ExportFile: utils.RemoveOssDomain(ossAddress),
}
logExportDao := dao.LogExportDao{}
_, _ = logExportDao.AddLogExportUnTransaction(logExport)
}
responses.OkWithData(ossAddress, c)
}

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
}

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+"%")

View File

@ -43,6 +43,7 @@ type OrderServicePackage struct {
User *User `gorm:"foreignKey:UserId;references:user_id" json:"user"` // 患者
OrderServicePackageInquiry []*OrderServicePackageInquiry `gorm:"foreignKey:OrderServiceId;references:order_service_id" json:"order_service_package_inquiry"` // 关联问诊订单
OrderServicePackageProduct []*OrderServicePackageProduct `gorm:"foreignKey:OrderServiceId;references:order_service_id" json:"order_service_package_product"` // 关联商品订单
UserPatient *UserPatient `gorm:"foreignKey:PatientId;references:patient_id" json:"user_patient"`
}
func (m *OrderServicePackage) TableName() string {

View File

@ -1,8 +1,9 @@
package requests
type OrderServicePackageRequest struct {
GetOrderServicePackagePage // 获取药品订单列表-分页
CancelOrderServicePackage // 取消服务包订单
GetOrderServicePackagePage // 获取药品订单列表-分页
CancelOrderServicePackage // 取消服务包订单
OrderServicePackageExportList // 获取服务包订单列表-导出
}
// GetOrderServicePackagePage 订单-服务包表
@ -38,3 +39,30 @@ type CancelOrderServicePackage struct {
RefundAmount *float64 `json:"refund_amount" form:"refund_amount" label:"退款金额"`
CancelRemarks string `json:"cancel_remarks" form:"cancel_remarks" validate:"required" label:"取消订单备注"`
}
// OrderServicePackageExportList 获取服务包订单列表-导出
type OrderServicePackageExportList struct {
Type int `json:"type" form:"type" label:"类型" validate:"required,oneof=1 2 3"` // 1:当前搜索数据 2:当前选择数据 3:全部数据
Id string `json:"id" form:"id" label:"id"` // 选择数据的id逗号分隔当type为2时必填
OrderId string `json:"order_id" form:"order_id" label:"订单id"` // 订单id
OrderServiceType *int `json:"order_service_type" form:"order_service_type" label:"服务包类型1:健康包 2:随访包)"` // 服务包类型1:健康包 2:随访包)
OrderServiceStatus *int `json:"order_service_status" form:"order_service_status" label:"订单状态1:待支付 2:未开始 3:服务中 4:服务完成 5:服务取消)"` // 订单状态1:待支付 2:未开始 3:服务中 4:服务完成 5:服务取消)
IsDelete *int `json:"is_delete" form:"is_delete" label:"删除状态0:否 1:是)"` // 删除状态0:否 1:是)
RefundStatus *int `json:"refund_status" form:"refund_status" label:"订单退款状态0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭 6:退款异常 7:部分退款)"` // 订单退款状态0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭 6:退款异常 7:部分退款)
PayChannel *int `json:"pay_channel" form:"pay_channel" label:"支付渠道1:小程序支付 2:微信扫码支付 3:模拟支付)"` // 支付渠道1:小程序支付 2:微信扫码支付 3:模拟支付)
PayStatus *int `json:"pay_status" form:"pay_status" label:"支付状态1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款)"` // 支付状态1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款)
OrderServiceNo string `json:"order_service_no" form:"order_service_no" label:"系统订单编号"` // 系统订单编号
EscrowTradeNo string `json:"escrow_trade_no" form:"escrow_trade_no" label:"第三方支付流水号"` // 第三方支付流水号
PayTime string `json:"pay_time" form:"pay_time" label:"支付时间"` // 支付时间
StartTime string `json:"start_time" form:"start_time" label:"开始服务时间"` // 开始服务时间
FinishTime string `json:"finish_time" form:"finish_time" label:"结束服务时间"` // 结束服务时间
CancelTime string `json:"cancel_time" form:"cancel_time" label:"订单取消时间"` // 订单取消时间
CancelReason *int `json:"cancel_reason" form:"cancel_reason" label:"取消订单原因1:医生未接受服务 2:主动取消 4:客服取消 5:支付超时)"` // 取消订单原因1:医生未接受服务 2:主动取消 4:客服取消 5:支付超时)
CancelRemarks string `json:"cancel_remarks" form:"cancel_remarks" label:"取消订单备注"` // 取消订单备注
AddFinishStatus *int `json:"add_finish_status" form:"add_finish_status" label:"添加完成订单延迟队列状态0:未添加 1:已添加 2:添加失败)"` // 添加完成订单延迟队列状态0:未添加 1:已添加 2:添加失败)
AddFinishTime string `json:"add_finish_time" form:"add_finish_time" label:"添加完成订单延迟队列时间"` // 添加完成订单延迟队列时间
PatientName string `json:"patient_name" form:"patient_name" label:"患者姓名-就诊人"` // 患者姓名-就诊人
CreatedAt string `json:"created_at" form:"created_at" label:"订单创建时间"` // 时间区间数组形式下标0为开始时间下标1为结束时间
Mobile string `json:"mobile" form:"mobile" label:"手机号-医生/患者"`
DoctorName string `json:"doctor_name" form:"doctor_name" label:"医生姓名"`
}

View File

@ -54,6 +54,7 @@ type GetProductPage struct {
// GetProductList 获取系统商品列表-限制条数
type GetProductList struct {
ProductId string `json:"product_id" form:"product_id" label:"商品id"` // 商品id
ProductName string `json:"product_name" form:"product_name" label:"商品名称"` // 商品名称
CommonName string `json:"common_name" form:"common_name" label:"商品通用名"` // 商品通用名
MnemonicCode string `json:"mnemonic_code" form:"mnemonic_code" label:"商品助记码"` // 商品助记码(首字母简拼)

View File

@ -713,6 +713,9 @@ func privateRouter(r *gin.Engine, api controller.Api) {
// 药品订单
orderGroup.POST("/product", api.Export.OrderProduct)
// 服务包订单
orderGroup.POST("/service", api.Export.OrderService)
}
// 处方

View File

@ -282,6 +282,34 @@ type OrderProductData struct {
CreatedAt time.Time // 创建时间
}
// OrderServicePackageDto 订单-服务包
type OrderServicePackageDto struct {
OrderServiceNo string // 系统订单编号
DoctorName string // 医生姓名
PatientName string // 患者姓名-就诊人
PatientSex string // 患者性别-就诊人0:未知 1:男 2:女)
PatientAge int // 患者年龄-就诊人
PatientMobile string // 患者电话
EscrowTradeNo string // 第三方支付流水号
OrderServiceType string // 服务包类型1:健康包 2:随访包)
OrderServiceStatus string // 订单状态1:待支付 2:未开始 3:服务中 4:服务完成 5:服务取消)
PayChannel string // 支付渠道1:小程序支付 2:微信扫码支付 3:模拟支付)
PayStatus string // 支付状态1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款)
CancelReason string // 取消订单原因1:医生未接受服务 2:主动取消 4:客服取消 5:支付超时)
AmountTotal float64 // 订单金额
PaymentAmountTotal float64 // 实际付款金额
PayTime time.Time // 支付时间
StartTime time.Time // 开始服务时间
FinishTime time.Time // 结束服务时间
RefundStatus string // 订单退款状态0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭 6:退款异常 7:部分退款)
CancelTime time.Time // 订单取消时间
CancelRemarks string // 取消订单备注
AddFinishStatus string // 添加完成订单延迟队列状态0:未添加 1:已添加 2:添加失败)
AddFinishTime time.Time // 添加完成订单延迟队列时间
AddFinishFailReason string // 添加完成订单延迟队列失败原因
CreatedAt time.Time // 创建时间
}
// OrderPrescriptionData 处方
type OrderPrescriptionData struct {
DoctorName string // 医生姓名
@ -1641,6 +1669,121 @@ func (r *ExportService) OrderProduct(d []*model.OrderProduct) (string, error) {
return ossPath, nil
}
// OrderServicePackage 服务包订单
func (r *ExportService) OrderServicePackage(d []*model.OrderServicePackage) (string, error) {
header := []utils.HeaderCellData{
{Value: "系统订单编号", CellType: "string", NumberFmt: "", ColWidth: 25},
{Value: "医生姓名", CellType: "string", NumberFmt: "", ColWidth: 18},
{Value: "患者姓名-就诊人", CellType: "string", NumberFmt: "", ColWidth: 18},
{Value: "患者性别-就诊人", CellType: "string", NumberFmt: "", ColWidth: 18},
{Value: "患者年龄-就诊人", CellType: "string", NumberFmt: "", ColWidth: 18},
{Value: "患者电话", CellType: "string", NumberFmt: "", ColWidth: 18},
{Value: "第三方支付流水号", CellType: "string", NumberFmt: "", ColWidth: 35},
{Value: "服务包类型", CellType: "string", NumberFmt: "", ColWidth: 25},
{Value: "订单状态", CellType: "string", NumberFmt: "", ColWidth: 18},
{Value: "支付渠道", CellType: "string", NumberFmt: "", ColWidth: 18},
{Value: "支付状态", CellType: "string", NumberFmt: "", ColWidth: 18},
{Value: "订单取消原因", CellType: "string", NumberFmt: "", ColWidth: 18},
{Value: "订单金额", CellType: "float64", NumberFmt: "0.0000", ColWidth: 18},
{Value: "实际付款金额", CellType: "float64", NumberFmt: "0.0000", ColWidth: 18},
{Value: "支付时间", CellType: "date", NumberFmt: "yyyy-mm-dd hh:mm:ss", ColWidth: 30},
{Value: "开始服务时间", CellType: "date", NumberFmt: "yyyy-mm-dd hh:mm:ss", ColWidth: 30},
{Value: "结束服务时间", CellType: "date", NumberFmt: "yyyy-mm-dd hh:mm:ss", ColWidth: 30},
{Value: "退款状态", CellType: "string", NumberFmt: "", ColWidth: 18},
{Value: "订单取消时间", CellType: "date", NumberFmt: "yyyy-mm-dd hh:mm:ss", ColWidth: 30},
{Value: "订单取消备注", CellType: "string", NumberFmt: "", ColWidth: 18},
{Value: "添加完成订单延迟队列状态", CellType: "string", NumberFmt: "", ColWidth: 18},
{Value: "添加完成订单延迟队列时间", CellType: "date", NumberFmt: "yyyy-mm-dd hh:mm:ss", ColWidth: 30},
{Value: "添加完成订单延迟队列失败原因", CellType: "string", NumberFmt: "", ColWidth: 18},
{Value: "创建时间", CellType: "date", NumberFmt: "yyyy-mm-dd hh:mm:ss", ColWidth: 30},
}
var dataSlice []interface{}
for _, v := range d {
data := OrderServicePackageDto{
OrderServiceNo: v.OrderServiceNo,
PatientName: v.PatientName,
PatientSex: utils.SexToString(v.PatientSex),
PatientAge: v.PatientAge,
EscrowTradeNo: v.EscrowTradeNo,
OrderServiceType: utils.OrderServiceTypeToString(v.OrderServiceType),
OrderServiceStatus: utils.OrderServiceStatusToString(v.OrderServiceStatus),
PayChannel: utils.PayChannelToString(v.PayChannel),
PayStatus: utils.PayStatusToString(v.PayStatus),
CancelReason: utils.OrderServicePackageCancelReasonToString(v.CancelReason),
AmountTotal: v.AmountTotal,
PaymentAmountTotal: v.AmountTotal,
RefundStatus: utils.RefundStatusToString(v.RefundStatus),
CancelRemarks: v.CancelRemarks,
AddFinishStatus: utils.AddFinishStatusToString(v.AddFinishStatus),
AddFinishFailReason: v.AddFinishFailReason,
}
if v.UserDoctor != nil {
// 医生姓名
data.DoctorName = v.UserDoctor.UserName
}
if v.UserPatient != nil {
if v.UserPatient.User != nil {
data.PatientMobile = v.UserPatient.User.Mobile
}
}
if v.PayTime != (model.LocalTime{}) {
t := time.Time(v.PayTime)
data.PayTime = t
}
if v.StartTime != (model.LocalTime{}) {
t := time.Time(v.StartTime)
data.StartTime = t
}
if v.FinishTime != (model.LocalTime{}) {
t := time.Time(v.FinishTime)
data.FinishTime = t
}
if v.CancelTime != (model.LocalTime{}) {
t := time.Time(v.CancelTime)
data.CancelTime = t
}
if v.AddFinishTime != (model.LocalTime{}) {
t := time.Time(v.AddFinishTime)
data.AddFinishTime = t
}
if v.CreatedAt != (model.LocalTime{}) {
t := time.Time(v.CreatedAt)
data.CreatedAt = t
}
dataSlice = append(dataSlice, data)
}
file, err := utils.Export(header, dataSlice)
if err != nil {
return "", err
}
// 设置文件名字
now := time.Now()
dateTimeString := now.Format("20060102150405") // 当前时间字符串
rand.New(rand.NewSource(time.Now().UnixNano())) // 设置随机数
ossPath := "admin/export/服务包订单" + dateTimeString + fmt.Sprintf("%d", rand.Intn(9000)+1000) + ".xlsx"
// 上传oss
_, err = aliyun.PutObjectByte(ossPath, file.Bytes())
if err != nil {
return "", err
}
ossPath = utils.AddOssDomain("/" + ossPath)
return ossPath, nil
}
// OrderPrescription 处方
func (r *ExportService) OrderPrescription(d []*model.OrderPrescription) (string, error) {
header := []utils.HeaderCellData{

View File

@ -603,3 +603,63 @@ func IsProductTypeToString(i int) string {
return ""
}
}
// OrderServiceTypeToString 服务包类型1:健康包 2:随访包)
func OrderServiceTypeToString(i int) string {
switch i {
case 1:
return "健康包"
case 2:
return "随访包"
default:
return ""
}
}
// OrderServiceStatusToString 订单状态1:待支付 2:未开始 3:服务中 4:服务完成 5:服务取消)
func OrderServiceStatusToString(i int) string {
switch i {
case 1:
return "待支付"
case 2:
return "未开始"
case 3:
return "服务中"
case 4:
return "服务完成"
case 5:
return "服务取消"
default:
return ""
}
}
// OrderServicePackageCancelReasonToString 取消订单原因1:医生未接受服务 2:主动取消 4:客服取消 5:支付超时)
func OrderServicePackageCancelReasonToString(i int) string {
switch i {
case 1:
return "医生未接受服务"
case 2:
return "主动取消"
case 3:
return "客服取消"
case 4:
return "支付超时"
default:
return ""
}
}
// AddFinishStatusToString 添加完成订单延迟队列状态0:未添加 1:已添加 2:添加失败)
func AddFinishStatusToString(i int) string {
switch i {
case 0:
return "未添加"
case 1:
return "已添加"
case 2:
return "添加失败"
default:
return "未知"
}
}