From c69e3468ef591efb9db3f51ca4fafc673906bc7e Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 11 Aug 2022 16:55:48 +0800 Subject: [PATCH 1/8] =?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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/supply/sku.go b/supply/sku.go index 4d7dbae..93daafe 100644 --- a/supply/sku.go +++ b/supply/sku.go @@ -147,6 +147,8 @@ type SkuItem struct { CustomerProfitRate decimal.Decimal `json:"customerProfitRate"` // 供货利润率 供货利润/供货最高价% AdjustType uint `json:"adjustType"` // 加价类型 AdjustPrice decimal.Decimal `json:"adjustPrice"` // 加价金额 + AfterAdjustType uint `json:"afterType"` // 改价后加价类型 + AfterAdjustPrice decimal.Decimal `json:"afterPrice"` // 改价后加价金额 Handle uint `json:"handle"` // 1=未处理 2=已处理 Reason string `json:"reason"` // 驳回原因 } From 24e3ab7ac4d923e67f21d6237c0a690d268f5c29 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 12 Aug 2022 13:55:42 +0800 Subject: [PATCH 2/8] =?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/service/service.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/customer/service/service.go b/customer/service/service.go index b72a1ab..3eaf512 100644 --- a/customer/service/service.go +++ b/customer/service/service.go @@ -6,7 +6,8 @@ import ( ) type Service struct { - Audit audit + Audit audit + Service service } type ArgsServiceLists struct { @@ -21,8 +22,11 @@ type ReplyServiceLists struct { AuditStatus uint `json:"auditStatus"` } +type service struct { +} + // All @Title 全部服务 -func (s *Service) All(ctx context.Context, customerId uint) (reply []ReplyServiceLists, err error) { +func (s *service) All(ctx context.Context, customerId uint) (reply []ReplyServiceLists, err error) { xClient, err := client.GetClient(s) if err != nil { return From 2c2b6059dcb04e8e8887c9cb0c512c34811bffe4 Mon Sep 17 00:00:00 2001 From: kanade Date: Fri, 12 Aug 2022 14:12:57 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- customer/user/user.go | 1 + supply/brand.go | 10 --------- supply/sku.go | 49 ------------------------------------------- 3 files changed, 1 insertion(+), 59 deletions(-) diff --git a/customer/user/user.go b/customer/user/user.go index 0c35d60..d77dbca 100644 --- a/customer/user/user.go +++ b/customer/user/user.go @@ -3,4 +3,5 @@ package user type User struct { Deposit deposit // 充值 DepositAudit depositAudit // 充值审核 + Wallet wallet // 钱包 } diff --git a/supply/brand.go b/supply/brand.go index f9a54ca..d4516ff 100644 --- a/supply/brand.go +++ b/supply/brand.go @@ -91,13 +91,3 @@ func (b *brand) FindByIds(ctx context.Context, args ArgsBrandFindByIds) (result err = xClient.Call(ctx, "FindByIds", args, &result) return } - -// Export @Title 导出品牌 -func (b *brand) Export(ctx context.Context, name string) (result []BrandItem, err error) { - xClient, err := client.GetClient(b) - if err != nil { - return - } - err = xClient.Call(ctx, "Export", name, &result) - return -} diff --git a/supply/sku.go b/supply/sku.go index 47e364d..10f21da 100644 --- a/supply/sku.go +++ b/supply/sku.go @@ -147,8 +147,6 @@ type SkuItem struct { CustomerProfitRate decimal.Decimal `json:"customerProfitRate"` // 供货利润率 供货利润/供货最高价% AdjustType uint `json:"adjustType"` // 加价类型 AdjustPrice decimal.Decimal `json:"adjustPrice"` // 加价金额 - AfterAdjustType uint `json:"afterType"` // 改价后加价类型 - AfterAdjustPrice decimal.Decimal `json:"afterPrice"` // 改价后加价金额 Handle uint `json:"handle"` // 1=未处理 2=已处理 Reason string `json:"reason"` // 驳回原因 } @@ -241,7 +239,6 @@ func (s *sku) GetImgs(ctx context.Context, skuId uint) (reply []SkuImg, err erro type ArgsReplaceImg struct { Id uint - SkuId uint ReplacePath string } @@ -255,49 +252,3 @@ func (s *sku) ReplaceImg(ctx context.Context, args ArgsReplaceImg) (err error) { err = xClient.Call(ctx, "ReplaceImg", args, &reply) return } - -type ArgsSkuChangePrice struct { - SourceSkuId string // 源skuId - SupplyPrice decimal.Decimal // 采购价 - GuidePrice decimal.Decimal // 指导价-建议售价 - Source source // 商品来源 -} - -// ChangePrice @Title 更新价格 -func (s *sku) ChangePrice(ctx context.Context, args ArgsSkuChangePrice) (err error) { - reply := 0 - xClient, err := client.GetClient(s) - if err != nil { - return err - } - err = xClient.Call(ctx, "ChangePrice", args, &reply) - return -} - -type ArgsSkuChangeData struct { - SourceSkuId string // 源skuId - SourceStatus uint // 源状态 - Name string // 商品名称 - BrandId uint // 品牌id - ThirdCategoryId uint // 三级分类id - SupplyPrice decimal.Decimal // 采购价 - GuidePrice decimal.Decimal // 指导价-建议售价 - Size string // 尺码 - Color string // 颜色 - Tax string // 税率 - Unit string // 销售单位 - UpcCode string // 商品条码 - Source source // 商品来源 - Specifications []SkuSpecification // 商品参数信息 -} - -// ChangeData @Title 更新商品信息 -func (s *sku) ChangeData(ctx context.Context, args ArgsSkuChangeData) (err error) { - reply := 0 - xClient, err := client.GetClient(s) - if err != nil { - return err - } - err = xClient.Call(ctx, "ChangeData", args, &reply) - return -} From 326319ebc598eaee714ca254f0c52873f4d17837 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 12 Aug 2022 14:39:20 +0800 Subject: [PATCH 4/8] =?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 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/supply/sku.go b/supply/sku.go index 47e364d..6d4f171 100644 --- a/supply/sku.go +++ b/supply/sku.go @@ -60,9 +60,8 @@ type ArgsSkuAdd struct { } type SkuImg struct { - Id uint `json:"id"` - Path string `json:"path"` - ReplacePath string `json:"replacePath"` + Id uint `json:"id"` + Path string `json:"path"` } type SkuSpecification struct { From 3408c0bb26abeab24245f34cfc31c876ff44ad32 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 12 Aug 2022 15:04:24 +0800 Subject: [PATCH 5/8] =?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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/supply/sku.go b/supply/sku.go index cfa63b0..4a7beb5 100644 --- a/supply/sku.go +++ b/supply/sku.go @@ -146,6 +146,8 @@ type SkuItem struct { CustomerProfitRate decimal.Decimal `json:"customerProfitRate"` // 供货利润率 供货利润/供货最高价% AdjustType uint `json:"adjustType"` // 加价类型 AdjustPrice decimal.Decimal `json:"adjustPrice"` // 加价金额 + AfterAdjustType uint `json:"afterAdjustType"` // 改价后加价类型 + AfterAdjustPrice decimal.Decimal `json:"afterAdjustPrice"` // 改价后加价金额 Handle uint `json:"handle"` // 1=未处理 2=已处理 Reason string `json:"reason"` // 驳回原因 } @@ -237,8 +239,9 @@ func (s *sku) GetImgs(ctx context.Context, skuId uint) (reply []SkuImg, err erro } type ArgsReplaceImg struct { - Id uint - ReplacePath string + SkuId uint + Id uint + Path string } // ReplaceImg @Title 替换图片 From c43960d9c86c81450d15bfb0cbe49bd1e21a26cc Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 12 Aug 2022 15:16:07 +0800 Subject: [PATCH 6/8] =?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/brand.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/supply/brand.go b/supply/brand.go index d4516ff..e804eec 100644 --- a/supply/brand.go +++ b/supply/brand.go @@ -49,6 +49,16 @@ func (b *brand) All(ctx context.Context) (result []BrandItem, err error) { return } +// All2 @Title 品牌名称筛选品牌 +func (b *brand) All2(ctx context.Context, name string) (result []BrandItem, err error) { + xClient, err := client.GetClient(b) + if err != nil { + return + } + err = xClient.Call(ctx, "All2", 0, &result) + return +} + type ArgsBrandAdd struct { Name string // 品牌名称 } From f68613e0668d7b9cd7260bcb8d9e83d0f0c6237b Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 12 Aug 2022 15:26:36 +0800 Subject: [PATCH 7/8] =?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/brand.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supply/brand.go b/supply/brand.go index e804eec..436e0eb 100644 --- a/supply/brand.go +++ b/supply/brand.go @@ -55,7 +55,7 @@ func (b *brand) All2(ctx context.Context, name string) (result []BrandItem, err if err != nil { return } - err = xClient.Call(ctx, "All2", 0, &result) + err = xClient.Call(ctx, "All2", name, &result) return } From 6fc1826e4dd2a79d85037fc2e927d5098b6fc626 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 12 Aug 2022 15:51:21 +0800 Subject: [PATCH 8/8] =?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/brand.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/supply/brand.go b/supply/brand.go index 436e0eb..8ac4215 100644 --- a/supply/brand.go +++ b/supply/brand.go @@ -49,13 +49,13 @@ func (b *brand) All(ctx context.Context) (result []BrandItem, err error) { return } -// All2 @Title 品牌名称筛选品牌 -func (b *brand) All2(ctx context.Context, name string) (result []BrandItem, err error) { +// FindByNameAll @Title 品牌名称筛选品牌 +func (b *brand) FindByNameAll(ctx context.Context, name string) (result []BrandItem, err error) { xClient, err := client.GetClient(b) if err != nil { return } - err = xClient.Call(ctx, "All2", name, &result) + err = xClient.Call(ctx, "FindByNameAll", name, &result) return }