refactor: remove redundant name fields from order service

This commit is contained in:
zetaloop
2026-04-22 22:28:41 +08:00
parent b3db04c9cc
commit 2d45d7e3cb
21 changed files with 179 additions and 1062 deletions
+1 -37
View File
@@ -21,16 +21,10 @@ type Orders struct {
ID int64 `json:"id,omitempty"`
// ConsumerID holds the value of the "consumer_id" field.
ConsumerID int64 `json:"consumer_id,omitempty"`
// ConsumerName holds the value of the "consumer_name" field.
ConsumerName string `json:"consumer_name,omitempty"`
// PlayerID holds the value of the "player_id" field.
PlayerID int64 `json:"player_id,omitempty"`
// PlayerName holds the value of the "player_name" field.
PlayerName string `json:"player_name,omitempty"`
// ShopID holds the value of the "shop_id" field.
ShopID *int64 `json:"shop_id,omitempty"`
// ShopName holds the value of the "shop_name" field.
ShopName *string `json:"shop_name,omitempty"`
// ServiceSnapshot holds the value of the "service_snapshot" field.
ServiceSnapshot map[string]interface{} `json:"service_snapshot,omitempty"`
// Status holds the value of the "status" field.
@@ -71,7 +65,7 @@ func (*Orders) scanValues(columns []string) ([]any, error) {
values[i] = new(decimal.Decimal)
case orders.FieldID, orders.FieldConsumerID, orders.FieldPlayerID, orders.FieldShopID, orders.FieldVersion:
values[i] = new(sql.NullInt64)
case orders.FieldConsumerName, orders.FieldPlayerName, orders.FieldShopName, orders.FieldStatus, orders.FieldNote, orders.FieldTimeoutJobID, orders.FieldSearchText:
case orders.FieldStatus, orders.FieldNote, orders.FieldTimeoutJobID, orders.FieldSearchText:
values[i] = new(sql.NullString)
case orders.FieldCreatedAt, orders.FieldAcceptedAt, orders.FieldClosedAt, orders.FieldCompletedAt, orders.FieldCancelledAt, orders.FieldUpdatedAt:
values[i] = new(sql.NullTime)
@@ -102,24 +96,12 @@ func (_m *Orders) assignValues(columns []string, values []any) error {
} else if value.Valid {
_m.ConsumerID = value.Int64
}
case orders.FieldConsumerName:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field consumer_name", values[i])
} else if value.Valid {
_m.ConsumerName = value.String
}
case orders.FieldPlayerID:
if value, ok := values[i].(*sql.NullInt64); !ok {
return fmt.Errorf("unexpected type %T for field player_id", values[i])
} else if value.Valid {
_m.PlayerID = value.Int64
}
case orders.FieldPlayerName:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field player_name", values[i])
} else if value.Valid {
_m.PlayerName = value.String
}
case orders.FieldShopID:
if value, ok := values[i].(*sql.NullInt64); !ok {
return fmt.Errorf("unexpected type %T for field shop_id", values[i])
@@ -127,13 +109,6 @@ func (_m *Orders) assignValues(columns []string, values []any) error {
_m.ShopID = new(int64)
*_m.ShopID = value.Int64
}
case orders.FieldShopName:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field shop_name", values[i])
} else if value.Valid {
_m.ShopName = new(string)
*_m.ShopName = value.String
}
case orders.FieldServiceSnapshot:
if value, ok := values[i].(*[]byte); !ok {
return fmt.Errorf("unexpected type %T for field service_snapshot", values[i])
@@ -260,25 +235,14 @@ func (_m *Orders) String() string {
builder.WriteString("consumer_id=")
builder.WriteString(fmt.Sprintf("%v", _m.ConsumerID))
builder.WriteString(", ")
builder.WriteString("consumer_name=")
builder.WriteString(_m.ConsumerName)
builder.WriteString(", ")
builder.WriteString("player_id=")
builder.WriteString(fmt.Sprintf("%v", _m.PlayerID))
builder.WriteString(", ")
builder.WriteString("player_name=")
builder.WriteString(_m.PlayerName)
builder.WriteString(", ")
if v := _m.ShopID; v != nil {
builder.WriteString("shop_id=")
builder.WriteString(fmt.Sprintf("%v", *v))
}
builder.WriteString(", ")
if v := _m.ShopName; v != nil {
builder.WriteString("shop_name=")
builder.WriteString(*v)
}
builder.WriteString(", ")
builder.WriteString("service_snapshot=")
builder.WriteString(fmt.Sprintf("%v", _m.ServiceSnapshot))
builder.WriteString(", ")