From 7139da58b7bba53f1187cca7330a21383a1b47f2 Mon Sep 17 00:00:00 2001 From: sian Date: Tue, 31 Jan 2023 15:35:27 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=B3=BB=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supply/channel/sku.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/supply/channel/sku.go b/supply/channel/sku.go index deb1780..7b909aa 100644 --- a/supply/channel/sku.go +++ b/supply/channel/sku.go @@ -80,19 +80,18 @@ type SkuEsSearch struct { MinDiscount decimal.Decimal // 最低折扣 MaxDiscount decimal.Decimal // 最高折扣 Expand []map[string]interface{} // 拓展查询 - CustomerSearch CustomerSearch // 客户系统的搜索条件 + CustomerSearch string // 客户系统搜索参数 + MinGuidePrice decimal.Decimal // 市场参考价 + MaxGuidePrice decimal.Decimal // 市场参考价 + Source uint // 所属供应商 + BrandIds []uint // 品牌Ids + ThirdCategoryIds []uint // 三级分类Ids } type ArgsSkuListsEs struct { Search SkuEsSearch Page bean.Page } -type CustomerSearch struct { - SkuName string - SkuId uint - BrandName string -} - // ListsEs @Title es商品列表 目前最大10000条数据，超出不显示 func (s *sku) ListsEs(ctx context.Context, channelId string, args ArgsSkuListsEs) (reply ReplySkuList, err error) { xClient, err := client.GetClient(s) From ebdd5c3163ad28b376ad509e6a2595b6b2242726 Mon Sep 17 00:00:00 2001 From: kanade Date: Wed, 1 Feb 2023 15:46:55 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=BB=E8=BE=91?= =?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/audit.go | 1 + 1 file changed, 1 insertion(+) diff --git a/customer/service/audit.go b/customer/service/audit.go index 8577bb4..f8c5196 100644 --- a/customer/service/audit.go +++ b/customer/service/audit.go @@ -149,6 +149,7 @@ type ReplyAuditInfo struct { AuditUserId uint `json:"auditUserId"` Expand any `json:"expand"` Enclosure string `json:"enclosure"` + ApplyType uint `json:"applyType"` } // Info @Title 详情 From 4a5b9512480a6478d1a0ecff2c5e6f9c91380290 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 2 Feb 2023 09:38:17 +0800 Subject: [PATCH 03/14] =?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/channel/sku.go | 1 - 1 file changed, 1 deletion(-) diff --git a/supply/channel/sku.go b/supply/channel/sku.go index 7b909aa..551335f 100644 --- a/supply/channel/sku.go +++ b/supply/channel/sku.go @@ -84,7 +84,6 @@ type SkuEsSearch struct { MinGuidePrice decimal.Decimal // 市场参考价 MaxGuidePrice decimal.Decimal // 市场参考价 Source uint // 所属供应商 - BrandIds []uint // 品牌Ids ThirdCategoryIds []uint // 三级分类Ids } type ArgsSkuListsEs struct { From a1fb48bd15d217e338aa246e3918363ee9ac3071 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 2 Feb 2023 14:13:55 +0800 Subject: [PATCH 04/14] =?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/audit.go | 1 + 1 file changed, 1 insertion(+) diff --git a/customer/service/audit.go b/customer/service/audit.go index f8c5196..54a06c7 100644 --- a/customer/service/audit.go +++ b/customer/service/audit.go @@ -30,6 +30,7 @@ type ArgsAuditLists struct { type AuditItem struct { Id uint `json:"id"` ServiceId uint `json:"serviceId"` + UserId uint `json:"userId"` UserName string `json:"userName"` ServiceName string `json:"serviceName"` ApplyUserId uint `json:"applyUserId"` From cfbf724f2f76220e4b5e0838ec295b5515363762 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 2 Feb 2023 14:37:09 +0800 Subject: [PATCH 05/14] =?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 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/supply/afterService.go b/supply/afterService.go index fd07646..89838bf 100644 --- a/supply/afterService.go +++ b/supply/afterService.go @@ -291,3 +291,22 @@ func (a *afterService) FindByAfsId(ctx context.Context, afsId uint) (reply Reply err = xClient.Call(ctx, "FindByAfsId", afsId, &reply) return } + +type ReplySourceSkuIdsAfsInfos struct { + SourceId uint // 供应商Id + SourceName string // 供应商名称 + ChannelId uint // 客户Id + SkuId uint // 沙马skuId + HopeTypeName string // 期望售后类型 + TypeReasonName string // 售后原因 +} + +// FindBySourceSkuIdsAfsInfos @Title 根据sourceSkuId查询售后信息 +func (a *afterService) FindBySourceSkuIdsAfsInfos(ctx context.Context, sourceSkuIds []uint) (reply []ReplySourceSkuIdsAfsInfos, err error) { + xClient, err := client.GetClient(a) + if err != nil { + return + } + err = xClient.Call(ctx, "FindBySourceSkuIdsAfsInfos", sourceSkuIds, &reply) + return +} From d720e1332e1d1321ee7f82d421a2624dbc783d17 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 2 Feb 2023 14:47:47 +0800 Subject: [PATCH 06/14] =?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 | 1 + 1 file changed, 1 insertion(+) diff --git a/supply/afterService.go b/supply/afterService.go index 89838bf..6c4ab21 100644 --- a/supply/afterService.go +++ b/supply/afterService.go @@ -297,6 +297,7 @@ type ReplySourceSkuIdsAfsInfos struct { SourceName string // 供应商名称 ChannelId uint // 客户Id SkuId uint // 沙马skuId + SourceSkuId string // 供应商skuId HopeTypeName string // 期望售后类型 TypeReasonName string // 售后原因 } From bdf3d0365a2ee43682a70692e8fe9cb7d4dd4d26 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 2 Feb 2023 14:56:21 +0800 Subject: [PATCH 07/14] =?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/afs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supplier/afs.go b/supplier/afs.go index 6472d3c..08ce9dd 100644 --- a/supplier/afs.go +++ b/supplier/afs.go @@ -109,7 +109,7 @@ type ReplyFindByAfsOrderInfo struct { Result string `json:"result"` // 处理结果 SkuName string `json:"skuName"` // 商品名称 SkuId uint `json:"skuId"` // 供应商编码 - Price decimal.Decimal `json:"price"` // 商品单价 + SupplyPrice decimal.Decimal `json:"price"` // 商品单价 Quantity uint `json:"quantity"` // 售后数量 UpcCode string `json:"upcCode"` // 商品条码 } From 68082647f01330950b44771fa0d46a6b654b4ae1 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 2 Feb 2023 14:58:45 +0800 Subject: [PATCH 08/14] =?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 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/supply/afterService.go b/supply/afterService.go index 6c4ab21..74cc598 100644 --- a/supply/afterService.go +++ b/supply/afterService.go @@ -293,13 +293,14 @@ func (a *afterService) FindByAfsId(ctx context.Context, afsId uint) (reply Reply } type ReplySourceSkuIdsAfsInfos struct { - SourceId uint // 供应商Id - SourceName string // 供应商名称 - ChannelId uint // 客户Id - SkuId uint // 沙马skuId - SourceSkuId string // 供应商skuId - HopeTypeName string // 期望售后类型 - TypeReasonName string // 售后原因 + SourceId uint // 供应商Id + SourceName string // 供应商名称 + ChannelId uint // 客户Id + SkuId uint // 沙马skuId + SourceSkuId string // 供应商skuId + HopeTypeName string // 期望售后类型 + TypeReasonName string // 售后原因 + CustomerPrice decimal.Decimal // 销售价格 } // FindBySourceSkuIdsAfsInfos @Title 根据sourceSkuId查询售后信息 From e9ae0f860c87365a35f03468ce10a57075953afb Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 2 Feb 2023 15:53:40 +0800 Subject: [PATCH 09/14] =?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 8ac4215..975915a 100644 --- a/supply/brand.go +++ b/supply/brand.go @@ -73,6 +73,16 @@ func (b *brand) Add(ctx context.Context, args ArgsBrandAdd) (err error) { return xClient.Call(ctx, "Add", args, &reply) } +// Adds @Title 添加品牌 +func (b *brand) Adds(ctx context.Context, brandNames []string) (err error) { + reply := 0 + xClient, err := client.GetClient(b) + if err != nil { + return err + } + return xClient.Call(ctx, "Adds", brandNames, &reply) +} + type ArgsBrandEdit struct { BrandId uint // 品牌id Name string // 品牌名称 From 59be592ae6d427a456146b217c35683ba728f8b0 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 3 Feb 2023 09:24:19 +0800 Subject: [PATCH 10/14] =?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/category.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/supply/category.go b/supply/category.go index 0795cfc..95b4416 100644 --- a/supply/category.go +++ b/supply/category.go @@ -40,6 +40,21 @@ func (c *category) Add(ctx context.Context, args ArgsCategoryAdd) (err error) { return xClient.Call(ctx, "Add", args, &reply) } +type ReplyCategoryAddError struct { + CategoryName string + ErrMsg string +} + +// Adds @Title 添加分类 +func (c *category) Adds(ctx context.Context, args []ArgsCategoryAdd) (reply []ReplyCategoryAddError, err error) { + xClient, err := client.GetClient(c) + if err != nil { + return + } + err = xClient.Call(ctx, "Adds", args, &reply) + return +} + type ArgsCategoryEdit struct { CategoryId uint // 分类id Name string // 分类名称 From 4f44445db762eca2f34d337b3dca16df1a20b80b Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 3 Feb 2023 10:36:25 +0800 Subject: [PATCH 11/14] =?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/category.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/supply/category.go b/supply/category.go index 95b4416..7558947 100644 --- a/supply/category.go +++ b/supply/category.go @@ -41,8 +41,8 @@ func (c *category) Add(ctx context.Context, args ArgsCategoryAdd) (err error) { } type ReplyCategoryAddError struct { - CategoryName string - ErrMsg string + CategoryName string `json:"categoryName"` + ErrMsg string `json:"errMsg"` } // Adds @Title 添加分类 From 5a888233e3f53c864be9478fdbe57a0ef5ce7ada Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 3 Feb 2023 10:57:14 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E8=BD=A8=E8=BF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wholesale/channel/order.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/wholesale/channel/order.go b/wholesale/channel/order.go index 242a246..cf60c9f 100644 --- a/wholesale/channel/order.go +++ b/wholesale/channel/order.go @@ -4,6 +4,7 @@ import ( "context" "git.oa00.com/supply-chain/service/client" "git.oa00.com/supply-chain/service/lib/bean" + _interface "git.oa00.com/supply-chain/service/wholesale/interface" "github.com/shopspring/decimal" "github.com/smallnest/rpcx/share" ) @@ -202,3 +203,13 @@ func (o *order) Finish(ctx context.Context, channelId, orderSn string) error { err = xClient.Call(context.WithValue(ctx, share.ReqMetaDataKey, map[string]string{"channelId": channelId}), "Finish", orderSn, &reply) return err } + +// Trajectory @Title 获取订单物流信息 +func (o *order) Trajectory(ctx context.Context, channelId string, orderSn string) (reply []_interface.ReplyTrajectory, err error) { + xClient, err := client.GetClient(o) + if err != nil { + return + } + err = xClient.Call(context.WithValue(ctx, share.ReqMetaDataKey, map[string]string{"channelId": channelId}), "Trajectory", orderSn, &reply) + return +} From 566f34d7ccab94c49a49f179ac496c787c055482 Mon Sep 17 00:00:00 2001 From: sian Date: Tue, 7 Feb 2023 11:36:14 +0800 Subject: [PATCH 13/14] =?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/audit.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/customer/service/audit.go b/customer/service/audit.go index 54a06c7..6400b25 100644 --- a/customer/service/audit.go +++ b/customer/service/audit.go @@ -28,16 +28,17 @@ type ArgsAuditLists struct { Page bean.Page // 分页 } type AuditItem struct { - Id uint `json:"id"` - ServiceId uint `json:"serviceId"` - UserId uint `json:"userId"` - UserName string `json:"userName"` - ServiceName string `json:"serviceName"` - ApplyUserId uint `json:"applyUserId"` - ApplyAt int64 `json:"applyAt"` - AuditStatus uint `json:"auditStatus"` - AuditUserId uint `json:"auditUserId"` - AuditAt int64 `json:"auditAt"` + Id uint `json:"id"` + ServiceId uint `json:"serviceId"` + UserId uint `json:"userId"` + UserName string `json:"userName"` + ServiceName string `json:"serviceName"` + ApplyUserId uint `json:"applyUserId"` + ApplyUserName string `json:"applyUserName"` + ApplyAt int64 `json:"applyAt"` + AuditStatus uint `json:"auditStatus"` + AuditUserId uint `json:"auditUserId"` + AuditAt int64 `json:"auditAt"` } type ReplyAuditLists struct { Lists []AuditItem `json:"lists"` From 5aee1c159a6cccb58313997984aa3a4d37d530d2 Mon Sep 17 00:00:00 2001 From: sian Date: Tue, 7 Feb 2023 11:46:44 +0800 Subject: [PATCH 14/14] =?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/audit.go | 22 +++++++++++----------- customer/user/deposit.go | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/customer/service/audit.go b/customer/service/audit.go index 6400b25..db1bbdb 100644 --- a/customer/service/audit.go +++ b/customer/service/audit.go @@ -28,17 +28,17 @@ type ArgsAuditLists struct { Page bean.Page // 分页 } type AuditItem struct { - Id uint `json:"id"` - ServiceId uint `json:"serviceId"` - UserId uint `json:"userId"` - UserName string `json:"userName"` - ServiceName string `json:"serviceName"` - ApplyUserId uint `json:"applyUserId"` - ApplyUserName string `json:"applyUserName"` - ApplyAt int64 `json:"applyAt"` - AuditStatus uint `json:"auditStatus"` - AuditUserId uint `json:"auditUserId"` - AuditAt int64 `json:"auditAt"` + Id uint `json:"id"` + ServiceId uint `json:"serviceId"` + UserId uint `json:"userId"` + UserName string `json:"userName"` + ServiceName string `json:"serviceName"` + ApplyUserId uint `json:"applyUserId"` + ApplyType uint `json:"ApplyType"` + ApplyAt int64 `json:"applyAt"` + AuditStatus uint `json:"auditStatus"` + AuditUserId uint `json:"auditUserId"` + AuditAt int64 `json:"auditAt"` } type ReplyAuditLists struct { Lists []AuditItem `json:"lists"` diff --git a/customer/user/deposit.go b/customer/user/deposit.go index 6f6419f..0817029 100644 --- a/customer/user/deposit.go +++ b/customer/user/deposit.go @@ -10,8 +10,8 @@ type deposit struct { } type applyType uint // 申请人类型 const ( - ApplyTypeCustomer = 1 // 客户 - ApplyTypePlatform = 2 // 平台 + ApplyTypePlatform = 1 // 平台 + ApplyTypeCustomer = 2 // 客户 DepositAuditStatusWait = 1 // 待审核 DepositAuditStatusAdopt = 2 // 审核通过