From 0c389e440a6205f5f62b3f92cf8869e0a127a880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= <midnite@outlook.com>
Date: Tue, 27 Jun 2023 15:05:04 +0800
Subject: [PATCH] =?UTF-8?q?fix(tenement):=E4=BF=AE=E6=AD=A3=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E4=B8=AD=E5=B8=A6=E6=9C=89JSONB=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=9A=84=E6=8F=92=E5=85=A5=E8=AF=AD=E5=8F=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 repository/tenement.go | 59 +++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 33 deletions(-)

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
 	}