This commit is contained in:
vipg
2025-11-26 16:27:18 +08:00
parent 4430d77c81
commit a2271b4e0d
2 changed files with 203 additions and 38 deletions

View File

@@ -120,4 +120,7 @@ updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
---
1、看一下./sql/07_variety.sql的内容并记住这些内容。
2、打开./src/logic4variety/read.go并维持风格不变的前提下将业务调整为1中的信息。
---
1、看一下./sql/07_variety.sql的内容并记住这些内容。
2、打开./src/logic4variety/update.go并维持风格不变的前提下将业务调整为1中的信息。
---

View File

@@ -12,10 +12,13 @@ import (
// UpdateRequest 更新请求参数结构
type UpdateRequest struct {
ExchangeID string `json:"exchange_id" binding:"required"` // 交易所ID必填
Name string `json:"name"` // 交易所名称,可选
Code string `json:"code"` // 交易所代码,可选
ShortName string `json:"short_name"` // 新增:交易所短名称,可选
VarietyID string `json:"variety_id" binding:"required"` // 品种ID必填
ExchangeID string `json:"exchange_id"` // 交易所ID,可选
ExchangeName string `json:"exchange_name"` // 交易所名称,可选
Name string `json:"name"` // 品种名称,可选
Code string `json:"code"` // 品种代码,可选
Tick float64 `json:"tick"` // 最小变动价位,可选
TickPrice float64 `json:"tick_price"` // 最小变动价值,可选
}
// UpdateResponse 更新响应结构
@@ -35,14 +38,14 @@ func UpdateHandler(c *gin.Context) {
}
// 记录请求接收日志
zap.L().Info("📥 收到交易所更新请求",
zap.L().Info("📥 收到品种更新请求",
zap.String("req_id", reqID),
zap.String("path", c.Request.URL.Path),
zap.String("method", c.Request.Method),
)
var req UpdateRequest
// 绑定并验证请求参数(主要验证exchange_id必填
// 绑定并验证请求参数(主要验证variety_id必填
if err := c.ShouldBindJSON(&req); err != nil {
zap.L().Warn("⚠️ 请求参数验证失败",
zap.String("req_id", reqID),
@@ -50,31 +53,34 @@ func UpdateHandler(c *gin.Context) {
)
c.JSON(http.StatusBadRequest, UpdateResponse{
Success: false,
Message: "请求参数错误:exchange_id为必填项",
Message: "请求参数错误:variety_id为必填项",
})
return
}
// 验证name、code和short_name不能同时为空
if req.Name == "" && req.Code == "" && req.ShortName == "" {
// 验证所有可选字段不能同时为空
if req.ExchangeID == "" && req.ExchangeName == "" && req.Name == "" && req.Code == "" && req.Tick == 0 && req.TickPrice == 0 {
zap.L().Warn("⚠️ 请求参数验证失败",
zap.String("req_id", reqID),
zap.String("exchange_id", req.ExchangeID),
zap.String("reason", "name、code和short_name不能同时为空"),
zap.String("variety_id", req.VarietyID),
zap.String("reason", "所有更新字段不能同时为空"),
)
c.JSON(http.StatusBadRequest, UpdateResponse{
Success: false,
Message: "请求参数错误:name、code和short_name不能同时为空",
Message: "请求参数错误:至少提供一个需要更新的字段",
})
return
}
zap.L().Debug("✅ 请求参数验证通过",
zap.String("req_id", reqID),
zap.String("variety_id", req.VarietyID),
zap.String("exchange_id", req.ExchangeID),
zap.String("exchange_name", req.ExchangeName),
zap.String("name", req.Name),
zap.String("code", req.Code),
zap.String("short_name", req.ShortName), // 新增短名称日志
zap.Float64("tick", req.Tick),
zap.Float64("tick_price", req.TickPrice),
)
// 开启数据库事务
@@ -111,69 +117,225 @@ func UpdateHandler(c *gin.Context) {
}
}()
// 如果name不为空更新name表
// 如果exchange_id或exchange_name不为空更新variety_exchange表
if req.ExchangeID != "" || req.ExchangeName != "" {
// 先查询是否已存在记录
var count int
err = tx.QueryRow("SELECT COUNT(*) FROM variety_exchange WHERE variety_id = $1 AND deleted = FALSE", req.VarietyID).Scan(&count)
if err != nil {
tx.Rollback()
zap.L().Error("❌ variety_exchange表查询失败",
zap.String("req_id", reqID),
zap.String("variety_id", req.VarietyID),
zap.Error(err),
)
c.JSON(http.StatusInternalServerError, UpdateResponse{
Success: false,
Message: "查询交易所信息失败",
})
return
}
if count > 0 {
// 更新现有记录
_, err = tx.Exec("UPDATE variety_exchange SET exchange_id = $1, exchange_name = $2 WHERE variety_id = $3", req.ExchangeID, req.ExchangeName, req.VarietyID)
} else {
// 插入新记录
_, err = tx.Exec("INSERT INTO variety_exchange (variety_id, exchange_id, exchange_name) VALUES ($1, $2, $3)", req.VarietyID, req.ExchangeID, req.ExchangeName)
}
if err != nil {
tx.Rollback()
zap.L().Error("❌ variety_exchange表更新失败",
zap.String("req_id", reqID),
zap.String("variety_id", req.VarietyID),
zap.Error(err),
)
c.JSON(http.StatusInternalServerError, UpdateResponse{
Success: false,
Message: "更新交易所信息失败",
})
return
}
zap.L().Debug("📝 variety_exchange表更新成功",
zap.String("req_id", reqID),
zap.String("variety_id", req.VarietyID),
)
}
// 如果name不为空更新variety_name表
if req.Name != "" {
_, err = tx.Exec("UPDATE exchange_name SET name = $1 WHERE exchange_id = $2", req.Name, req.ExchangeID)
// 先查询是否已存在记录
var count int
err = tx.QueryRow("SELECT COUNT(*) FROM variety_name WHERE variety_id = $1 AND deleted = FALSE", req.VarietyID).Scan(&count)
if err != nil {
tx.Rollback()
zap.L().Error("❌ exchange_name表更新失败",
zap.L().Error("❌ variety_name表查询失败",
zap.String("req_id", reqID),
zap.String("exchange_id", req.ExchangeID),
zap.String("variety_id", req.VarietyID),
zap.Error(err),
)
c.JSON(http.StatusInternalServerError, UpdateResponse{
Success: false,
Message: "更新名称信息失败",
Message: "查询品种名称失败",
})
return
}
zap.L().Debug("📝 name表更新成功",
if count > 0 {
_, err = tx.Exec("UPDATE variety_name SET name = $1 WHERE variety_id = $2", req.Name, req.VarietyID)
} else {
_, err = tx.Exec("INSERT INTO variety_name (variety_id, name) VALUES ($1, $2)", req.VarietyID, req.Name)
}
if err != nil {
tx.Rollback()
zap.L().Error("❌ variety_name表更新失败",
zap.String("req_id", reqID),
zap.String("variety_id", req.VarietyID),
zap.Error(err),
)
c.JSON(http.StatusInternalServerError, UpdateResponse{
Success: false,
Message: "更新品种名称失败",
})
return
}
zap.L().Debug("📝 variety_name表更新成功",
zap.String("req_id", reqID),
zap.String("exchange_id", req.ExchangeID),
zap.String("variety_id", req.VarietyID),
)
}
// 如果code不为空更新code表
// 如果code不为空更新variety_code表
if req.Code != "" {
_, err = tx.Exec("UPDATE exchange_code SET code = $1 WHERE exchange_id = $2", req.Code, req.ExchangeID)
// 先查询是否已存在记录
var count int
err = tx.QueryRow("SELECT COUNT(*) FROM variety_code WHERE variety_id = $1 AND deleted = FALSE", req.VarietyID).Scan(&count)
if err != nil {
tx.Rollback()
zap.L().Error("❌ exchange_code表更新失败",
zap.L().Error("❌ variety_code表查询失败",
zap.String("req_id", reqID),
zap.String("exchange_id", req.ExchangeID),
zap.String("variety_id", req.VarietyID),
zap.Error(err),
)
c.JSON(http.StatusInternalServerError, UpdateResponse{
Success: false,
Message: "更新代码信息失败",
Message: "查询品种代码失败",
})
return
}
zap.L().Debug("📝 code表更新成功",
if count > 0 {
_, err = tx.Exec("UPDATE variety_code SET code = $1 WHERE variety_id = $2", req.Code, req.VarietyID)
} else {
_, err = tx.Exec("INSERT INTO variety_code (variety_id, code) VALUES ($1, $2)", req.VarietyID, req.Code)
}
if err != nil {
tx.Rollback()
zap.L().Error("❌ variety_code表更新失败",
zap.String("req_id", reqID),
zap.String("variety_id", req.VarietyID),
zap.Error(err),
)
c.JSON(http.StatusInternalServerError, UpdateResponse{
Success: false,
Message: "更新品种代码失败",
})
return
}
zap.L().Debug("📝 variety_code表更新成功",
zap.String("req_id", reqID),
zap.String("exchange_id", req.ExchangeID),
zap.String("variety_id", req.VarietyID),
)
}
// 新增如果short_name不为,更新short_name
if req.ShortName != "" {
_, err = tx.Exec("UPDATE exchange_short_name SET short_name = $1 WHERE exchange_id = $2", req.ShortName, req.ExchangeID)
// 如果tick不为0,更新variety_tick
if req.Tick != 0 {
// 先查询是否已存在记录
var count int
err = tx.QueryRow("SELECT COUNT(*) FROM variety_tick WHERE variety_id = $1 AND deleted = FALSE", req.VarietyID).Scan(&count)
if err != nil {
tx.Rollback()
zap.L().Error("❌ exchange_short_name表更新失败",
zap.L().Error("❌ variety_tick表查询失败",
zap.String("req_id", reqID),
zap.String("exchange_id", req.ExchangeID),
zap.String("variety_id", req.VarietyID),
zap.Error(err),
)
c.JSON(http.StatusInternalServerError, UpdateResponse{
Success: false,
Message: "更新短名称信息失败",
Message: "查询最小变动价位失败",
})
return
}
zap.L().Debug("📝 short_name表更新成功",
if count > 0 {
_, err = tx.Exec("UPDATE variety_tick SET tick = $1 WHERE variety_id = $2", req.Tick, req.VarietyID)
} else {
_, err = tx.Exec("INSERT INTO variety_tick (variety_id, tick) VALUES ($1, $2)", req.VarietyID, req.Tick)
}
if err != nil {
tx.Rollback()
zap.L().Error("❌ variety_tick表更新失败",
zap.String("req_id", reqID),
zap.String("variety_id", req.VarietyID),
zap.Error(err),
)
c.JSON(http.StatusInternalServerError, UpdateResponse{
Success: false,
Message: "更新最小变动价位失败",
})
return
}
zap.L().Debug("📝 variety_tick表更新成功",
zap.String("req_id", reqID),
zap.String("exchange_id", req.ExchangeID),
zap.String("variety_id", req.VarietyID),
)
}
// 如果tick_price不为0更新variety_tick_price表
if req.TickPrice != 0 {
// 先查询是否已存在记录
var count int
err = tx.QueryRow("SELECT COUNT(*) FROM variety_tick_price WHERE variety_id = $1 AND deleted = FALSE", req.VarietyID).Scan(&count)
if err != nil {
tx.Rollback()
zap.L().Error("❌ variety_tick_price表查询失败",
zap.String("req_id", reqID),
zap.String("variety_id", req.VarietyID),
zap.Error(err),
)
c.JSON(http.StatusInternalServerError, UpdateResponse{
Success: false,
Message: "查询最小变动价值失败",
})
return
}
if count > 0 {
_, err = tx.Exec("UPDATE variety_tick_price SET price = $1 WHERE variety_id = $2", req.TickPrice, req.VarietyID)
} else {
_, err = tx.Exec("INSERT INTO variety_tick_price (variety_id, price) VALUES ($1, $2)", req.VarietyID, req.TickPrice)
}
if err != nil {
tx.Rollback()
zap.L().Error("❌ variety_tick_price表更新失败",
zap.String("req_id", reqID),
zap.String("variety_id", req.VarietyID),
zap.Error(err),
)
c.JSON(http.StatusInternalServerError, UpdateResponse{
Success: false,
Message: "更新最小变动价值失败",
})
return
}
zap.L().Debug("📝 variety_tick_price表更新成功",
zap.String("req_id", reqID),
zap.String("variety_id", req.VarietyID),
)
}
@@ -182,7 +344,7 @@ func UpdateHandler(c *gin.Context) {
tx.Rollback()
zap.L().Error("❌ 事务提交失败",
zap.String("req_id", reqID),
zap.String("exchange_id", req.ExchangeID),
zap.String("variety_id", req.VarietyID),
zap.Error(err),
)
c.JSON(http.StatusInternalServerError, UpdateResponse{
@@ -194,9 +356,9 @@ func UpdateHandler(c *gin.Context) {
// 记录请求处理耗时
duration := time.Since(startTime)
zap.L().Info("✅ 交易所更新请求处理完成",
zap.L().Info("✅ 品种更新请求处理完成",
zap.String("req_id", reqID),
zap.String("exchange_id", req.ExchangeID),
zap.String("variety_id", req.VarietyID),
zap.Duration("duration", duration),
)