From f469b36833cbc972d839e3ec84824f5b9ebbb580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=AD=90=E9=93=AD?= <zi__mm@163.com>
Date: Thu, 20 Mar 2025 16:06:13 +0800
Subject: [PATCH] db fail

---
 internal/data/db.go               | 8 +-------
 internal/data/gorm_test.go        | 4 ++--
 internal/data/repoimpl/order.go   | 6 +++---
 internal/data/repoimpl/product.go | 2 +-
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/internal/data/db.go b/internal/data/db.go
index b6d4f07..a18626a 100644
--- a/internal/data/db.go
+++ b/internal/data/db.go
@@ -15,12 +15,6 @@ func NewDb(db *GormDb) *Db {
 	}
 }
 
-type contextTxKey struct{}
-
-func (d *Db) DB(ctx context.Context) *gorm.DB {
-	tx, ok := ctx.Value(contextTxKey{}).(*gorm.DB)
-	if ok {
-		return tx
-	}
+func (d *Db) DB(_ context.Context) *gorm.DB {
 	return d.db.Client
 }
diff --git a/internal/data/gorm_test.go b/internal/data/gorm_test.go
index 5245aaa..fe6bf04 100644
--- a/internal/data/gorm_test.go
+++ b/internal/data/gorm_test.go
@@ -35,8 +35,8 @@ func Test_db(t *testing.T) {
 		go func() {
 			defer wg.Done()
 
-			var order model.Order
-			tx := gormDb.First(&order)
+			var m model.Product
+			tx := gormDb.Model(model.Product{}).Where(model.Product{ProductNo: "001"}).Find(&m)
 			if tx.Error != nil {
 				if errors.Is(tx.Error, gorm.ErrRecordNotFound) {
 					t.Errorf("未找到记录")
diff --git a/internal/data/repoimpl/order.go b/internal/data/repoimpl/order.go
index f4f2062..fb16714 100644
--- a/internal/data/repoimpl/order.go
+++ b/internal/data/repoimpl/order.go
@@ -87,7 +87,7 @@ func (p *OrderRepoImpl) GetByOutBizNo(ctx context.Context, t vo.OrderType, outBi
 	tx := p.DB(ctx).Where(model.Order{Type: t.GetValue(), OutBizNo: outBizNo}).Find(&info)
 
 	if tx.Error != nil {
-		return nil, fmt.Errorf("db fail %w", tx.Error)
+		return nil, fmt.Errorf("order db fail %w", tx.Error)
 	}
 
 	if tx.RowsAffected == 0 {
@@ -103,7 +103,7 @@ func (p *OrderRepoImpl) GetByID(ctx context.Context, id uint64) (*bo.OrderBo, er
 	tx := p.DB(ctx).Where(model.Order{ID: id}).Find(&info)
 
 	if tx.Error != nil {
-		return nil, fmt.Errorf("db fail %w", tx.Error)
+		return nil, fmt.Errorf("order db fail %w", tx.Error)
 	}
 
 	if tx.RowsAffected == 0 {
@@ -119,7 +119,7 @@ func (p *OrderRepoImpl) GetByOrderNo(ctx context.Context, orderNo string) (*bo.O
 	tx := p.DB(ctx).Where(model.Order{OrderNo: orderNo}).Find(&info)
 
 	if tx.Error != nil {
-		return nil, fmt.Errorf("db fail %w", tx.Error)
+		return nil, fmt.Errorf("order db fail %w", tx.Error)
 	}
 
 	if tx.RowsAffected == 0 {
diff --git a/internal/data/repoimpl/product.go b/internal/data/repoimpl/product.go
index 2ebbde1..f4a9b71 100644
--- a/internal/data/repoimpl/product.go
+++ b/internal/data/repoimpl/product.go
@@ -32,7 +32,7 @@ func (r *ProductRepoImpl) GetByPNO(ctx context.Context, PNO string) (*bo.Product
 	tx := r.DB(ctx).Where(model.Product{ProductNo: PNO}).Find(&item)
 
 	if tx.Error != nil {
-		return nil, fmt.Errorf("db fail %w", tx.Error)
+		return nil, fmt.Errorf("product db fail %w", tx.Error)
 	}
 
 	if tx.RowsAffected == 0 {