diff --git a/app/mix/service/logic/vas.go b/app/mix/service/logic/vas.go index 87871a40..a42807de 100644 --- a/app/mix/service/logic/vas.go +++ b/app/mix/service/logic/vas.go @@ -3343,10 +3343,10 @@ func (v *Vas) refundCoinContactWechat(ctx *gin.Context, order *dbstruct.CoinOrde } incomeChList = append(incomeChList, ch) } - if len(incomeChList) > 1 { - err = errors.New("收入记录错误,请找开发同学排查") - return err - } + //if len(incomeChList) > 1 { + // err = errors.New("收入记录错误,请找开发同学排查") + // return err + //} // 有分成的情况 if len(incomeChList) > 0 { diff --git a/app/mix/service/logic/vas_zone.go b/app/mix/service/logic/vas_zone.go index c07b7672..9fd108c2 100644 --- a/app/mix/service/logic/vas_zone.go +++ b/app/mix/service/logic/vas_zone.go @@ -52,6 +52,9 @@ func (v *Vas) CheckZoneUnlockExist(ctx *gin.Context, tx *sqlx.Tx, mid, zid int64 // 设置空间价格 func (v *Vas) UpdateZoneVasInfo(ctx *gin.Context, req *vasproto.UpdateZoneVasReq) error { + if req.AdmissionPrice <= 0 && req.IronfanshipPrice <= 0 && req.SuperfanshipPrice <= 0 { + return nil + } err := v.store.UpsertZoneVas(ctx, req.ZoneVas) return err } @@ -157,6 +160,9 @@ func (v *Vas) RollbackZoneConsume(ctx *gin.Context, tx *sqlx.Tx, orderId string) // 设置动态价格 func (v *Vas) UpdateZoneMomentPrice(ctx *gin.Context, req *vasproto.UpdateZoneMomentPriceReq) error { + if req.Price <= 0 { + return nil + } err := v.store.UpsertZoneMomentPrice(ctx, req.ZoneMomentPrice) return err }