From 42144e7125a425a626fa2da6755490ddc215fd30 Mon Sep 17 00:00:00 2001 From: sian Date: Wed, 19 Oct 2022 17:53:15 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supply/sku.go | 1 + 1 file changed, 1 insertion(+) diff --git a/supply/sku.go b/supply/sku.go index 15a59a7..7bcaec7 100644 --- a/supply/sku.go +++ b/supply/sku.go @@ -146,6 +146,7 @@ type SkuItem struct { SourceStatus uint `json:"sourceStatus"` // 供应商状态 1=上架 2=下架 CustomerPrice decimal.Decimal `json:"customerPrice"` // 供货最高价 CustomerProfitRate decimal.Decimal `json:"customerProfitRate"` // 供货利润率 供货利润/供货最高价% + CustomerDiscount decimal.Decimal `json:"customerDiscount"` // 折扣 AdjustType uint `json:"adjustType"` // 加价类型 AdjustPrice decimal.Decimal `json:"adjustPrice"` // 加价金额 AfterAdjustType uint `json:"afterAdjustType"` // 改价后加价类型 From 71cd2fa679ac75c3b119a9e59cef96ec0ca1f973 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 20 Oct 2022 09:55:13 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supply/sku.go | 1 + 1 file changed, 1 insertion(+) diff --git a/supply/sku.go b/supply/sku.go index 7bcaec7..8b88e26 100644 --- a/supply/sku.go +++ b/supply/sku.go @@ -151,6 +151,7 @@ type SkuItem struct { AdjustPrice decimal.Decimal `json:"adjustPrice"` // 加价金额 AfterAdjustType uint `json:"afterAdjustType"` // 改价后加价类型 AfterAdjustPrice decimal.Decimal `json:"afterAdjustPrice"` // 改价后加价金额 + Reason string // 改价驳回原因 } // Lists @Title 商品列表 From 0ad499b45748b6639e2a8f494fca3dbeb1589637 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 20 Oct 2022 11:37:02 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supplier/goods.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/supplier/goods.go b/supplier/goods.go index b5628d6..454836d 100644 --- a/supplier/goods.go +++ b/supplier/goods.go @@ -10,10 +10,13 @@ import ( type goods struct { } type GoodsSearch struct { - Name string // 商品名称 - CategoryId uint64 // 类目id - BrandName string // 品牌名 - Handle uint // 处理状态 1=待处理 2=入库 3=废弃 + Name string // 商品名称 + CategoryId uint64 // 类目id + BrandName string // 品牌名 + Handle uint // 处理状态 1=待处理 2=入库 3=废弃 + SkuId uint // 供应商skuId + MinSupplyPrice decimal.Decimal // 最小采购价 + MaxSupplyPrice decimal.Decimal // 最大采购价 } type ArgsGoodsList struct { Search GoodsSearch From 2b6ac8e200b000f98614591f85213cdc50b70a86 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 20 Oct 2022 15:26:16 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supplier/goods.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/supplier/goods.go b/supplier/goods.go index 454836d..e6b7702 100644 --- a/supplier/goods.go +++ b/supplier/goods.go @@ -171,3 +171,18 @@ func (g *goods) ReHandle(ctx context.Context, goodsIds []uint) (reply []AdoptIte err = xClient.Call(ctx, "ReHandle", goodsIds, &reply) return } + +type ReplyByIdItem struct { + GoodsId uint `json:"goodsId"` + SourceName string `json:"sourceName"` +} + +// FindByIds @Title 根据商品Ids获取商品信息 +func (g *goods) FindByIds(ctx context.Context, goodsIds []uint) (reply []AdoptItem, err error) { + xClient, err := client.GetClient(g) + if err != nil { + return nil, err + } + err = xClient.Call(ctx, "FindByIds", goodsIds, &reply) + return +} From 26a17f1b5f8e95392fffd3883069bc8c49c0d47d Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 20 Oct 2022 15:57:48 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supplier/goods.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/supplier/goods.go b/supplier/goods.go index e6b7702..b74d9ed 100644 --- a/supplier/goods.go +++ b/supplier/goods.go @@ -177,12 +177,12 @@ type ReplyByIdItem struct { SourceName string `json:"sourceName"` } -// FindByIds @Title 根据商品Ids获取商品信息 -func (g *goods) FindByIds(ctx context.Context, goodsIds []uint) (reply []AdoptItem, err error) { +// FindBySkuIds @Title 根据商品Ids获取商品信息 +func (g *goods) FindBySkuIds(ctx context.Context, goodsIds []uint) (reply []AdoptItem, err error) { xClient, err := client.GetClient(g) if err != nil { return nil, err } - err = xClient.Call(ctx, "FindByIds", goodsIds, &reply) + err = xClient.Call(ctx, "FindBySkuIds", goodsIds, &reply) return } From 39c9b3ec940e55a83fcc1ccd9f1cafe84f39801b Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 20 Oct 2022 16:05:43 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supplier/goods.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supplier/goods.go b/supplier/goods.go index b74d9ed..bb22f49 100644 --- a/supplier/goods.go +++ b/supplier/goods.go @@ -178,7 +178,7 @@ type ReplyByIdItem struct { } // FindBySkuIds @Title 根据商品Ids获取商品信息 -func (g *goods) FindBySkuIds(ctx context.Context, goodsIds []uint) (reply []AdoptItem, err error) { +func (g *goods) FindBySkuIds(ctx context.Context, goodsIds []uint) (reply []ReplyByIdItem, err error) { xClient, err := client.GetClient(g) if err != nil { return nil, err From b303b2266bf8a5f35c47f03e81745213b5597b5e Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 20 Oct 2022 16:07:59 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supplier/goods.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supplier/goods.go b/supplier/goods.go index bb22f49..bed9bb8 100644 --- a/supplier/goods.go +++ b/supplier/goods.go @@ -173,7 +173,7 @@ func (g *goods) ReHandle(ctx context.Context, goodsIds []uint) (reply []AdoptIte } type ReplyByIdItem struct { - GoodsId uint `json:"goodsId"` + SkuId uint `json:"skuId"` SourceName string `json:"sourceName"` }