wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feat-IRONFANS-70' into test

This commit is contained in:
lwl0608 2024-04-19 23:55:04 +08:00
parent 31e925cd19 fcb867cc88
commit 5d0f4fe0a6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mix/dao/mysql_zone.go
View File

@ -131,7 +131,7 @@ func (m *Mysql) UnlockZoneMoment(ctx *gin.Context, tx *sqlx.Tx, mid, zid, moment
// 再添加 // 再添加
sqlStr := "insert into " + TableVasZoneMomentUnlock + " (mid,zid,moment_id,status,ct,order_id) " + " values (?,?,?,?,?,?)" sqlStr := "insert into " + TableVasZoneMomentUnlock + " (mid,zid,moment_id,status,ct,order_id) " + " values (?,?,?,?,?,?)"
args := []any{mid, zid, momentId, dbstruct.ZoneMomentUnlockStatusLock, time.Now().Unix(), orderId} args := []any{mid, zid, momentId, dbstruct.ZoneMomentUnlockStatusUnlock, time.Now().Unix(), orderId}
if tx != nil { if tx != nil {
_, err = tx.ExecContext(ctx, sqlStr, args...) _, err = tx.ExecContext(ctx, sqlStr, args...)
} else { } else {

2
app/mix/service/utilservice.go
View File

@ -1674,6 +1674,8 @@ func (s *Service) utilFillZoneMomentsWithApiVOInfo(ctx *gin.Context, list []*dbs
// 6.获取空间价格 // 6.获取空间价格
zvMap, _ := _DefaultVas.GetZoneVasByIds(ctx, zids) zvMap, _ := _DefaultVas.GetZoneVasByIds(ctx, zids)
logger.Info("_MomentVO zvMap: %v", util.ToJson(zvMap))
logger.Info("_MomentVO zidZuMap: %v", util.ToJson(zidZuMap))
// 7.填充所有信息 // 7.填充所有信息
for _, vo := range volist { for _, vo := range volist {