From c3e7dd629591c70b2bdf1311d7e39030067e2cb1 Mon Sep 17 00:00:00 2001 From: sian Date: Mon, 17 Oct 2022 15:46:34 +0800 Subject: [PATCH 1/2] =?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/afterService.go | 3 +++ supply/sku.go | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/supply/afterService.go b/supply/afterService.go index 55f2f14..e5658ce 100644 --- a/supply/afterService.go +++ b/supply/afterService.go @@ -29,12 +29,15 @@ type RetailHistorySearch struct { } type RetailHistoryItem struct { + Id uint `json:"id"` + Img string `json:"img"` AfterServiceSn uint64 `json:"afterServiceSn"` OrderSn uint64 `json:"orderSn"` Name string `json:"name"` Quantity uint `json:"quantity"` Status uint `json:"status"` Reason string `json:"reason"` + Result string `json:"result"` CreatedAt int64 `json:"createdAt"` UpdatedAt int64 `json:"updatedAt"` Source string `json:"source"` diff --git a/supply/sku.go b/supply/sku.go index 5855669..15a59a7 100644 --- a/supply/sku.go +++ b/supply/sku.go @@ -109,12 +109,12 @@ type ArgsSkuLists struct { } type SkuListsSearch struct { + Id uint // 瑞库客id Name string // 商品名称 SourceId uint // 所属供应商 1=京东 - Id uint // 瑞库客id SourceSkuId uint // 供应商skuId BrandId uint // 品牌Id - ThridCategoryId uint // 三级分类Id + ThirdCategoryId uint // 三级分类Id AdjustType uint // 加价规则 MaxSupplyPrice decimal.Decimal // 最大采购价格 MinSupplyPrice decimal.Decimal // 最小采购价格 From c6110b3b0637fa123100d5fe086aa10a677270ee Mon Sep 17 00:00:00 2001 From: sian Date: Mon, 17 Oct 2022 17:15:41 +0800 Subject: [PATCH 2/2] =?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/afterService.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/supply/afterService.go b/supply/afterService.go index 656b51b..4fec33a 100644 --- a/supply/afterService.go +++ b/supply/afterService.go @@ -30,14 +30,12 @@ type RetailHistorySearch struct { type RetailHistoryItem struct { Id uint `json:"id"` - Img string `json:"img"` AfterServiceSn uint64 `json:"afterServiceSn"` OrderSn uint64 `json:"orderSn"` Name string `json:"name"` Quantity uint `json:"quantity"` Status uint `json:"status"` Reason string `json:"reason"` - Result string `json:"result"` CreatedAt int64 `json:"createdAt"` UpdatedAt int64 `json:"updatedAt"` Source string `json:"source"`