Merge branch 'feat-IRONFANS-70' into test
This commit is contained in:
commit
5d0f4fe0a6
|
@ -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 (?,?,?,?,?,?)"
|
||||
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 {
|
||||
_, err = tx.ExecContext(ctx, sqlStr, args...)
|
||||
} else {
|
||||
|
|
|
@ -1674,6 +1674,8 @@ func (s *Service) utilFillZoneMomentsWithApiVOInfo(ctx *gin.Context, list []*dbs
|
|||
|
||||
// 6.获取空间价格
|
||||
zvMap, _ := _DefaultVas.GetZoneVasByIds(ctx, zids)
|
||||
logger.Info("_MomentVO zvMap: %v", util.ToJson(zvMap))
|
||||
logger.Info("_MomentVO zidZuMap: %v", util.ToJson(zidZuMap))
|
||||
|
||||
// 7.填充所有信息
|
||||
for _, vo := range volist {
|
||||
|
|
Loading…
Reference in New Issue