diff --git a/repository/tenement.go b/repository/tenement.go index 9e1e869..e3c1339 100644 --- a/repository/tenement.go +++ b/repository/tenement.go @@ -197,40 +197,33 @@ func (tr _TenementRepository) AddTenement(tx pgx.Tx, ctx context.Context, pid st serial.StringSerialRequestChan <- 1 tenementId := serial.Prefix("T", <-serial.StringSerialResponseChan) currentTime := types.Now() - createSql, createArgs, _ := tr.ds. - Insert("tenement"). - Cols( - "id", "park_id", "full_name", "short_name", "abbr", "address", "contact_name", "contact_phone", - "building", "on_floor", "invoice_info", - "moved_in_at", "created_at", "last_modified_at", - ). - Vals( - goqu.Vals{ - tenementId, - pid, - tenement.Name, - tenement.ShortName, - tools.PinyinAbbr(tenement.Name), - tenement.Address, - tenement.Contact, - tenement.Phone, - tenement.Building, - tenement.OnFloor, - &model.InvoiceTitle{ - Name: tenement.Name, - USCI: tenement.USCI, - Address: tools.DefaultOrEmptyStr(tenement.InvoiceAddress, ""), - Phone: tools.DefaultOrEmptyStr(tenement.InvoicePhone, ""), - Bank: tools.DefaultOrEmptyStr(tenement.Bank, ""), - Account: tools.DefaultOrEmptyStr(tenement.Account, ""), - }, - currentTime, - currentTime, - currentTime, + if _, err := tx.Exec( + ctx, + "INSERT INTO tenement (id, park_id, full_name, short_name, abbr, address, contact_name, contact_phone, building, on_floor, invoice_info, moved_in_at, created_at, last_modified_at) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)", + []interface{}{ + tenementId, + pid, + tenement.Name, + tenement.ShortName, + tools.PinyinAbbr(tenement.Name), + tenement.Address, + tenement.Contact, + tenement.Phone, + tenement.Building, + tenement.OnFloor, + &model.InvoiceTitle{ + Name: tenement.Name, + USCI: tenement.USCI, + Address: tools.DefaultOrEmptyStr(tenement.InvoiceAddress, ""), + Phone: tools.DefaultOrEmptyStr(tenement.InvoicePhone, ""), + Bank: tools.DefaultOrEmptyStr(tenement.Bank, ""), + Account: tools.DefaultOrEmptyStr(tenement.Account, ""), }, - ). - Prepared(true).ToSQL() - if _, err := tx.Exec(ctx, createSql, createArgs...); err != nil { + currentTime, + currentTime, + currentTime, + }..., + ); err != nil { tr.log.Error("在指定园区中创建一个新的商户失败", zap.Error(err)) return err }