From 8a808595b186420236c0c726f34a57fd271abd07 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 20 Oct 2022 15:27:34 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- customer/user/wallet.go | 6 ++++-- supply/sku.go | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/customer/user/wallet.go b/customer/user/wallet.go index 9df4525..a9ae2c0 100644 --- a/customer/user/wallet.go +++ b/customer/user/wallet.go @@ -11,8 +11,10 @@ type wallet struct { type walletType uint // 费用类型 const ( - WalletTypeIncome walletType = 1 // 收入 - WalletTypeExpend walletType = 2 // 支出 + WalletTypeIncome walletType = 1 // 收入 + WalletTypeExpend walletType = 2 // 支出 + WalletTypeBack = 3 // 退款 + WalletTypeConsumption = 4 // 消费 WalletStatusHandle = 1 // 处理中 WalletStatusSuccess = 2 // 成功 diff --git a/supply/sku.go b/supply/sku.go index 8b88e26..6579968 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"` // 改价后加价金额 + AfterPrice decimal.Decimal `json:"afterPrice"` // 改价记录 Reason string // 改价驳回原因 } From 95c4e579bbe7a1443e3aca579af72e86e39ce29b Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 21 Oct 2022 13:39:56 +0800 Subject: [PATCH 2/6] =?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 6579968..084d9ab 100644 --- a/supply/sku.go +++ b/supply/sku.go @@ -181,6 +181,7 @@ type SkuEsSearch struct { ThirdCategoryId uint // 三级分类id ThirdCategoryName string // 三级分类名称 全词匹配 AdjustType uint // 加价规则 1=比例 2=金额 + Handel uint // 处理状态 MaxSupplyPrice decimal.Decimal // 最高金额 MinSupplyPrice decimal.Decimal // 最低金额 MinDiscount decimal.Decimal // 最低折扣 From 281f96953f9b8052f7cfeb0a0e3f42f5cda7b14e Mon Sep 17 00:00:00 2001 From: sian Date: Tue, 25 Oct 2022 09:37:29 +0800 Subject: [PATCH 3/6] =?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/skuAudit.go | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/supply/skuAudit.go b/supply/skuAudit.go index 5624d0b..d013923 100644 --- a/supply/skuAudit.go +++ b/supply/skuAudit.go @@ -96,3 +96,65 @@ func (s *skuAudit) Reject(ctx context.Context, args ArgsSkuAuditReject) error { func (s *skuAudit) Stock() { } + +type ArgsApplyHistory struct { + Search ApplyHistorySearch + Page bean.Page +} + +type ApplyHistorySearch struct { + Id uint // 瑞库客id + Name string // 商品名称 + SourceId uint // 所属供应商 1=京东 + SourceSkuId uint // 供应商skuId + BrandId uint // 品牌Id + ThirdCategoryId uint // 三级分类Id + AdjustType uint // 加价规则 + MaxSupplyPrice decimal.Decimal // 最大采购价格 + MinSupplyPrice decimal.Decimal // 最小采购价格 + CustomerProfitRate uint // 折扣 0=全部 1=5折以下 2=6 3=7 4=8 5=9折以下 + Handle uint // 处理状态 + AuditStatus uint // 审核状态 + SourceStatus uint // 供应商下架状态 + PlatformStatus uint // 平台下架状态 +} + +type ApplyHistoryItem struct { + Id uint `json:"id"` + Name string `json:"name"` // 名称 + BrandName string `json:"brandName"` // 品牌名称 + FirstCategoryId uint `json:"firstCategoryId"` // 一级分类id + SecondCategoryId uint `json:"secondCategoryId"` // 二级分类id + ThirdCategoryId uint `json:"thirdCategoryId"` // 三级分类id + SupplyPrice decimal.Decimal `json:"supplyPrice"` // 采购价 + GuidePrice decimal.Decimal `json:"guidePrice"` // 指导价 + ImgUrl string `json:"imgUrl"` // 商品主图 + PlatformStatus uint `json:"platformStatus"` // 平台状态 1=上架 2=下架 + SourceName string `json:"sourceName"` // 供应商名称 + SourceSkuId string `json:"sourceSkuId"` // 源skuId + 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"` // 改价后加价类型 + AfterAdjustPrice decimal.Decimal `json:"afterAdjustPrice"` // 改价后加价金额 + AfterPrice decimal.Decimal `json:"afterPrice"` // 改价记录 + Reason string // 改价驳回原因 +} + +type ReplyApplyHistoryLists struct { + Lists []ApplyHistoryItem `json:"lists"` + Total int64 `json:"total"` +} + +// ApplyHistory @Title 改价申请记录 +func (s *skuAudit) ApplyHistory(ctx context.Context, args ArgsApplyHistory) (reply []ReplyApplyHistoryLists, err error) { + xClient, err := client.GetClient(s) + if err != nil { + return nil, err + } + err = xClient.Call(ctx, "ApplyHistory", args, &reply) + return +} From 3fb66d388e2b27d913b568f7a967ad54d748a370 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 27 Oct 2022 16:07:28 +0800 Subject: [PATCH 4/6] =?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/supplier.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/supplier/supplier.go b/supplier/supplier.go index 88101ec..0a0902b 100644 --- a/supplier/supplier.go +++ b/supplier/supplier.go @@ -151,3 +151,18 @@ func (s *supplier) UpdateWarn(ctx context.Context, args ArgsSupplierUpdateWarn) reply := 0 return xClient.Call(ctx, "UpdateWarn", args, &reply) } + +type ReplySupplierItem struct { + Id uint `json:"id"` + Name string `json:"name"` +} + +// Select @Title 筛选非禁用的供应商 +func (s *supplier) Select(ctx context.Context, status uint) (reply []ReplyByIdItem, err error) { + xClient, err := client.GetClient(s) + if err != nil { + return nil, err + } + err = xClient.Call(ctx, "Select", status, &reply) + return +} From a8632a1dbbad4ee732f1954b21f1ddd9e99fa7c3 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 27 Oct 2022 16:14:58 +0800 Subject: [PATCH 5/6] =?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/supplier.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supplier/supplier.go b/supplier/supplier.go index 0a0902b..64fafe3 100644 --- a/supplier/supplier.go +++ b/supplier/supplier.go @@ -158,7 +158,7 @@ type ReplySupplierItem struct { } // Select @Title 筛选非禁用的供应商 -func (s *supplier) Select(ctx context.Context, status uint) (reply []ReplyByIdItem, err error) { +func (s *supplier) Select(ctx context.Context, status uint) (reply []ReplySupplierItem, err error) { xClient, err := client.GetClient(s) if err != nil { return nil, err From 08facd05ebb4bc9867713b39af9b8ade0bce29a3 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 27 Oct 2022 17:18:22 +0800 Subject: [PATCH 6/6] =?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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/supplier/goods.go b/supplier/goods.go index bed9bb8..5bad243 100644 --- a/supplier/goods.go +++ b/supplier/goods.go @@ -178,11 +178,11 @@ type ReplyByIdItem struct { } // FindBySkuIds @Title 根据商品Ids获取商品信息 -func (g *goods) FindBySkuIds(ctx context.Context, goodsIds []uint) (reply []ReplyByIdItem, err error) { +func (g *goods) FindBySkuIds(ctx context.Context, skuIds []uint) (reply []ReplyByIdItem, err error) { xClient, err := client.GetClient(g) if err != nil { return nil, err } - err = xClient.Call(ctx, "FindBySkuIds", goodsIds, &reply) + err = xClient.Call(ctx, "FindBySkuIds", skuIds, &reply) return }