完善气站客服工单详情展示

This commit is contained in:
czl231
2026-08-22 10:48:36 +08:00
parent b85e879130
commit 79749685ee
9 changed files with 252 additions and 10 deletions

View File

@@ -11,12 +11,45 @@ import (
)
func ticketQuery(gasID uint64) *gorm.DB {
return common.ActiveRecords(impl.DBService.Model(&models.CsTicket{})).
return ticketQueryWithDB(impl.DBService, gasID)
}
// ticketQueryWithDB 统一客服工单的数据范围查询,并允许只读 SQL 测试注入数据库连接。
func ticketQueryWithDB(databaseService *gorm.DB, gasID uint64) *gorm.DB {
return common.ActiveRecords(databaseService.Model(&models.CsTicket{})).
Joins("JOIN user_service_relation ON user_service_relation.user_account_id = cs_ticket.user_account_id AND user_service_relation.status <> ?",
common.StatusArchived).
Where("user_service_relation.gas_basic_id = ?", gasID)
}
// ticketDetailDisplay 为工单详情附加当前记录所引用关系的可读名称,不修改工单归属数据。
type ticketDetailDisplay struct {
models.CsTicket
UserAccountDisplayName string `gorm:"column:user_account_display_name" json:"user_account_display_name"`
DeliveryBasicDisplayName string `gorm:"column:delivery_basic_display_name" json:"delivery_basic_display_name"`
StaffAccountDisplayName string `gorm:"column:staff_account_display_name" json:"staff_account_display_name"`
GasBasicDisplayName string `gorm:"column:gas_basic_display_name" json:"gas_basic_display_name"`
}
// ticketDetailQuery 在当前气站可见范围内解析关系名称,已失效关系仍保留可信的历史名称。
func ticketDetailQuery(gasID uint64) *gorm.DB {
return ticketDetailQueryWithDB(impl.DBService, gasID)
}
// ticketDetailQueryWithDB 构造可测试的详情名称查询,不改变通用列表查询。
func ticketDetailQueryWithDB(databaseService *gorm.DB, gasID uint64) *gorm.DB {
return ticketQueryWithDB(databaseService, gasID).
Select(`cs_ticket.*,
COALESCE(NULLIF(ticket_user.name, ''), NULLIF(ticket_user.real_name, ''), NULLIF(ticket_user.username, ''), '用户记录已失效') AS user_account_display_name,
CASE WHEN cs_ticket.delivery_basic_id = 0 THEN '' ELSE COALESCE(NULLIF(ticket_delivery.name, ''), '配送点记录已失效') END AS delivery_basic_display_name,
CASE WHEN cs_ticket.staff_account_id = 0 THEN '' ELSE COALESCE(NULLIF(ticket_staff.name, ''), NULLIF(ticket_staff.username, ''), '工作人员记录已失效') END AS staff_account_display_name,
CASE WHEN cs_ticket.gas_basic_id = 0 THEN '' ELSE COALESCE(NULLIF(ticket_gas.name, ''), '气站记录已失效') END AS gas_basic_display_name`).
Joins("LEFT JOIN user_account AS ticket_user ON ticket_user.id = cs_ticket.user_account_id").
Joins("LEFT JOIN delivery_basic AS ticket_delivery ON ticket_delivery.id = cs_ticket.delivery_basic_id").
Joins("LEFT JOIN staff_account AS ticket_staff ON ticket_staff.id = cs_ticket.staff_account_id").
Joins("LEFT JOIN gas_basic AS ticket_gas ON ticket_gas.id = cs_ticket.gas_basic_id")
}
func ListTicket(ctx *gin.Context) {
station, ok := currentGas(ctx)
if !ok {
@@ -30,8 +63,8 @@ func GetTicket(ctx *gin.Context) {
if !ok {
return
}
var ticket models.CsTicket
respondScopedRecord(ctx, ticketQuery(station.ID).Where("cs_ticket.identity = ?", ctx.Param("identity")), &ticket)
var ticket ticketDetailDisplay
respondScopedRecord(ctx, ticketDetailQuery(station.ID).Where("cs_ticket.identity = ?", ctx.Param("identity")), &ticket)
}
type ticketRequest struct {

View File

@@ -1,6 +1,13 @@
package gas
import "testing"
import (
"strings"
"testing"
"github.com/DATA-DOG/go-sqlmock"
"gorm.io/driver/postgres"
"gorm.io/gorm"
)
// TestSupportedTicketValues 验证气站端工单枚举白名单。
func TestSupportedTicketValues(t *testing.T) {
@@ -20,3 +27,34 @@ func TestSupportedTicketValues(t *testing.T) {
}
}
}
// TestTicketDetailQueryIncludesScopedRelationNames 验证详情名称查询保留气站范围并解析全部关系名称。
func TestTicketDetailQueryIncludesScopedRelationNames(t *testing.T) {
connection, _, err := sqlmock.New()
if err != nil {
t.Fatalf("create SQL mock: %v", err)
}
t.Cleanup(func() { _ = connection.Close() })
databaseService, err := gorm.Open(postgres.New(postgres.Config{Conn: connection}), &gorm.Config{DryRun: true})
if err != nil {
t.Fatalf("open GORM database: %v", err)
}
statement := ticketDetailQueryWithDB(databaseService, 42).
Find(&ticketDetailDisplay{}).Statement.SQL.String()
for _, fragment := range []string{
"user_service_relation.gas_basic_id =",
"LEFT JOIN user_account AS ticket_user",
"LEFT JOIN delivery_basic AS ticket_delivery",
"LEFT JOIN staff_account AS ticket_staff",
"LEFT JOIN gas_basic AS ticket_gas",
"user_account_display_name",
"delivery_basic_display_name",
"staff_account_display_name",
"gas_basic_display_name",
} {
if !strings.Contains(statement, fragment) {
t.Fatalf("ticket detail display SQL must include %q, got: %s", fragment, statement)
}
}
}