structs/storage/article.go

@@ -17,12 +17,6 @@ type articleApi struct {
 	db *gorm.DB
 }
 
-func NewArticleApi(db *gorm.DB) ArticleApi {
-	return &articleApi{
-		db: db,
-	}
-}
-
 // Upsert 插入或者更新商品
 func (a *articleApi) Upsert(article v2.Article) error {
 	return a.db.Clauses(clause.OnConflict{

structs/storage/provider-article_test.go

@@ -1,32 +0,0 @@
-package storage
-
-import (
-	"testing"
-
-	v2 "gitea.timerzz.com/kedaya_haitao/common/structs/v2"
-)
-
-var providerArticle = v2.ProviderArticle{
-	ArticleID: 1,
-	Brand:     v2.Brand_Coach,
-	Cost: v2.ProviderPrice{
-		CalMark:           "111",
-		FinalPrice:        1,
-		OriginalPrice:     0,
-		ProviderArticleID: 0,
-	},
-	HistoryPrice: []v2.ProviderPrice{
-		{
-			CalMark: "222",
-		},
-	},
-}
-
-func TestProviderArticleApi_Upsert(t *testing.T) {
-	db, err := GetDevDB()
-	if err != nil {
-		t.Fatal(err)
-	}
-	storage := NewStorage(db)
-	storage.ProviderArticle().Upsert(providerArticle)
-}

structs/storage/storage.go

@@ -12,10 +12,11 @@ type Storage struct {
 
 func NewStorage(db *gorm.DB) *Storage {
 	return &Storage{
-		articleApi:         NewArticleApi(db),
-		providerApi:        NewProviderApi(db),
-		providerArticleApi: NewProviderArticleApi(db),
-		sellerApi:          NewSellerApi(db),
+		articleApi: &articleApi{
+			db: db,
+		},
+		providerApi: NewProviderApi(db),
+		sellerApi:   NewSellerApi(db),
 	}
 }
 

structs/v2/provider.go

@@ -19,7 +19,7 @@ type Provider struct {
 	//计算过程
 	CalculateProcess []CalculateProcess `json:"calculateProcess" gorm:"polymorphicType:Kind;polymorphicId:OwnerID;polymorphicValue:provider"`
 	// 备注
-	Remark string `json:"remark,omitempty"`
+	Mark string `json:"mark,omitempty"`
 }
 
 type ProviderOption struct {

structs/v2/seller.go

@@ -19,8 +19,6 @@ type Seller struct {
 	Config SellerOption `gorm:"type:json;serializer:json" json:"config"`
 	//计算过程
 	CalculateProcess []CalculateProcess `json:"calculateProcess" gorm:"polymorphicType:Kind;polymorphicId:OwnerID;polymorphicValue:seller"`
-	// 备注
-	Remark string `json:"remark,omitempty"`
 }
 
 type SellerOption struct {