From d2141a2c7de7d90e8855fbc5647b20bc749bd8b3 Mon Sep 17 00:00:00 2001 From: kanade Date: Tue, 17 Jan 2023 10:15:49 +0800 Subject: [PATCH 01/33] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- customer/service/audit.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/customer/service/audit.go b/customer/service/audit.go index 4254ce1..8577bb4 100644 --- a/customer/service/audit.go +++ b/customer/service/audit.go @@ -89,6 +89,7 @@ type ArgsAuditApply struct { ApplyUserId uint `json:"applyUserId"` // 申请人id CustomerId uint `json:"customerId"` // 客户id ExpirationAt time.Time `json:"expirationAt"` // 到期时间 + Enclosure string `json:"enclosure"` // 附件 Expand any `json:"expand"` // 拓展参数 } @@ -147,6 +148,7 @@ type ReplyAuditInfo struct { Reason string `json:"reason"` AuditUserId uint `json:"auditUserId"` Expand any `json:"expand"` + Enclosure string `json:"enclosure"` } // Info @Title 详情 From 5eef9a229189bfc1a8ed1932871bcfcf2378aa50 Mon Sep 17 00:00:00 2001 From: sian Date: Tue, 31 Jan 2023 10:10:10 +0800 Subject: [PATCH 02/33] =?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 | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/supplier/afs.go b/supplier/afs.go index 24df47e..6472d3c 100644 --- a/supplier/afs.go +++ b/supplier/afs.go @@ -32,6 +32,7 @@ type AfsItem struct { Id uint `json:"id"` AfsSn string `json:"afsSn"` OrderSubSn string `json:"orderSubSn"` + SkuId uint `json:"skuId"` SkuName string `json:"skuName"` Quantity uint `json:"quantity"` Status uint `json:"status"` @@ -96,6 +97,33 @@ func (a *afs) Detail(ctx context.Context, afsSn uint64) (reply ReplyAfsDetail, e return } +type ReplyFindByAfsOrderInfo struct { + Id uint `json:"id"` + CreatedAt int64 `json:"createdAt"` // 申请时间 + UpdatedAt int64 `json:"updatedAt"` // 更新时间 + AfsSn string `json:"afsSn"` // 售后单号 + OrderSubSn string `json:"orderSubSn"` // 订单号 + HandleStatus uint `json:"handleStatus"` // 处理结果 + Status uint `json:"status"` // 售后状态 + ApproveNotes string `json:"approveNotes"` // 处理描述 + Result string `json:"result"` // 处理结果 + SkuName string `json:"skuName"` // 商品名称 + SkuId uint `json:"skuId"` // 供应商编码 + Price decimal.Decimal `json:"price"` // 商品单价 + Quantity uint `json:"quantity"` // 售后数量 + UpcCode string `json:"upcCode"` // 商品条码 +} + +// FindByAfsOrderInfos @Title 根据售后单号批量查询信息 +func (a *afs) FindByAfsOrderInfos(ctx context.Context, afsSns []uint64) (reply []ReplyFindByAfsOrderInfo, err error) { + xClient, err := client.GetClient(a) + if err != nil { + return + } + err = xClient.Call(ctx, "FindByAfsOrderInfos", afsSns, &reply) + return +} + type ArgsAfsReject struct { AfsSn string `json:"afsSn"` Notes string `json:"notes"` From 810ca4f43e3f549345569f0e565f58c3e028eeef Mon Sep 17 00:00:00 2001 From: kanade Date: Tue, 31 Jan 2023 10:48:45 +0800 Subject: [PATCH 03/33] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=93=81=E7=89=8C?= =?UTF-8?q?=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wholesale/brand.go | 47 +++++++------------------------------------ wholesale/category.go | 37 +++++----------------------------- 2 files changed, 12 insertions(+), 72 deletions(-) diff --git a/wholesale/brand.go b/wholesale/brand.go index 231096b..dc75db1 100644 --- a/wholesale/brand.go +++ b/wholesale/brand.go @@ -3,34 +3,14 @@ package wholesale import ( "context" "git.oa00.com/supply-chain/service/client" - "git.oa00.com/supply-chain/service/lib/bean" + "git.oa00.com/supply-chain/service/supply" ) type brand struct { } -type ArgsBrandList struct { - Search BrandSearch - Page bean.Page -} - -type BrandItem struct { - Id uint `json:"id"` - Name string `json:"name"` - CreatedAt int64 `json:"createdAt"` - UpdatedAt int64 `json:"updatedAt"` -} -type ReplyBrandList struct { - Lists []BrandItem `json:"lists"` - Total int64 `json:"total"` -} - -type BrandSearch struct { - Name string // 品牌名称 -} - // Lists @Title 品牌列表 -func (b *brand) Lists(ctx context.Context, args ArgsBrandList) (result ReplyBrandList, err error) { +func (b *brand) Lists(ctx context.Context, args supply.ArgsBrandList) (result supply.ReplyBrandList, err error) { xClient, err := client.GetClient(b) if err != nil { return @@ -40,7 +20,7 @@ func (b *brand) Lists(ctx context.Context, args ArgsBrandList) (result ReplyBran } // All @Title 全部品牌 -func (b *brand) All(ctx context.Context) (result []BrandItem, err error) { +func (b *brand) All(ctx context.Context) (result []supply.BrandItem, err error) { xClient, err := client.GetClient(b) if err != nil { return @@ -50,7 +30,7 @@ func (b *brand) All(ctx context.Context) (result []BrandItem, err error) { } // FindByNameAll @Title 品牌名称筛选品牌 -func (b *brand) FindByNameAll(ctx context.Context, name string) (result []BrandItem, err error) { +func (b *brand) FindByNameAll(ctx context.Context, name string) (result []supply.BrandItem, err error) { xClient, err := client.GetClient(b) if err != nil { return @@ -59,12 +39,8 @@ func (b *brand) FindByNameAll(ctx context.Context, name string) (result []BrandI return } -type ArgsBrandAdd struct { - Name string // 品牌名称 -} - // Add @Title 添加品牌 -func (b *brand) Add(ctx context.Context, args ArgsBrandAdd) (err error) { +func (b *brand) Add(ctx context.Context, args supply.ArgsBrandAdd) (err error) { reply := 0 xClient, err := client.GetClient(b) if err != nil { @@ -73,13 +49,8 @@ func (b *brand) Add(ctx context.Context, args ArgsBrandAdd) (err error) { return xClient.Call(ctx, "Add", args, &reply) } -type ArgsBrandEdit struct { - BrandId uint // 品牌id - Name string // 品牌名称 -} - // Edit @Title 编辑品牌 -func (b *brand) Edit(ctx context.Context, args ArgsBrandEdit) (err error) { +func (b *brand) Edit(ctx context.Context, args supply.ArgsBrandEdit) (err error) { reply := 0 xClient, err := client.GetClient(b) if err != nil { @@ -88,12 +59,8 @@ func (b *brand) Edit(ctx context.Context, args ArgsBrandEdit) (err error) { return xClient.Call(ctx, "Edit", args, &reply) } -type ArgsBrandFindByIds struct { - BrandIds []uint // 品牌id数组 -} - // FindByIds @Title 品牌获取 -func (b *brand) FindByIds(ctx context.Context, args ArgsBrandFindByIds) (result []BrandItem, err error) { +func (b *brand) FindByIds(ctx context.Context, args supply.ArgsBrandFindByIds) (result []supply.BrandItem, err error) { xClient, err := client.GetClient(b) if err != nil { return diff --git a/wholesale/category.go b/wholesale/category.go index 6d6295d..4e90bb7 100644 --- a/wholesale/category.go +++ b/wholesale/category.go @@ -3,20 +3,14 @@ package wholesale import ( "context" "git.oa00.com/supply-chain/service/client" + "git.oa00.com/supply-chain/service/supply" ) type category struct { } -type CategoryItem struct { - Id uint `json:"id"` - Name string `json:"name"` - ParentId uint `json:"parentId"` - Children []CategoryItem `json:"children"` -} - // All @Title 获取分类 -func (c *category) All(ctx context.Context) (result []CategoryItem, err error) { +func (c *category) All(ctx context.Context) (result []supply.CategoryItem, err error) { xClient, err := client.GetClient(c) if err != nil { return @@ -25,13 +19,8 @@ func (c *category) All(ctx context.Context) (result []CategoryItem, err error) { return } -type ArgsCategoryAdd struct { - Name string // 分类名称 - ParentId uint // 上级id -} - // Add @Title 添加分类 -func (c *category) Add(ctx context.Context, args ArgsCategoryAdd) (err error) { +func (c *category) Add(ctx context.Context, args supply.ArgsCategoryAdd) (err error) { reply := 0 xClient, err := client.GetClient(c) if err != nil { @@ -40,14 +29,8 @@ func (c *category) Add(ctx context.Context, args ArgsCategoryAdd) (err error) { return xClient.Call(ctx, "Add", args, &reply) } -type ArgsCategoryEdit struct { - CategoryId uint // 分类id - Name string // 分类名称 - ParentId uint // 上级id -} - // Edit @Title 编辑分类 -func (c *category) Edit(ctx context.Context, args ArgsCategoryEdit) (err error) { +func (c *category) Edit(ctx context.Context, args supply.ArgsCategoryEdit) (err error) { reply := 0 xClient, err := client.GetClient(c) if err != nil { @@ -56,18 +39,8 @@ func (c *category) Edit(ctx context.Context, args ArgsCategoryEdit) (err error) return xClient.Call(ctx, "Edit", args, &reply) } -type ArgsCategoryFindByIds struct { - ThirdCategoryIds []uint // 三级分类id数组 -} -type ThirdCategoryItem struct { - Id uint `json:"id"` - Name string `json:"name"` - ParentId uint `json:"parentId"` - Parent *ThirdCategoryItem `json:"parent"` -} - // FindByIds @Title 三级分类获取 -func (c *category) FindByIds(ctx context.Context, args ArgsCategoryFindByIds) (result []ThirdCategoryItem, err error) { +func (c *category) FindByIds(ctx context.Context, args supply.ArgsCategoryFindByIds) (result []supply.ThirdCategoryItem, err error) { xClient, err := client.GetClient(c) if err != nil { return From 6f30c29e791272b6ca298eb9ff279cd046781569 Mon Sep 17 00:00:00 2001 From: sian Date: Tue, 31 Jan 2023 13:04:11 +0800 Subject: [PATCH 04/33] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=8A=B6=E6=80=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jd/task.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/jd/task.go b/jd/task.go index 9017f45..a8bf25c 100644 --- a/jd/task.go +++ b/jd/task.go @@ -37,3 +37,18 @@ func (t *task) RefreshToken(ctx context.Context) error { } return xClient.Call(ctx, "RefreshToken", 0, &a) } + +type ReplySkuAddStatus struct { + Total uint + Count uint +} + +// GetSkuAddStatus @Title 获取同步状态 +func (t *task) GetSkuAddStatus(ctx context.Context) (reply ReplySkuAddStatus, err error) { + xClient, err := client.GetClient(t) + if err != nil { + return + } + err = xClient.Call(ctx, "GetSkuAddStatus", 0, &reply) + return +} From 7139da58b7bba53f1187cca7330a21383a1b47f2 Mon Sep 17 00:00:00 2001 From: sian Date: Tue, 31 Jan 2023 15:35:27 +0800 Subject: [PATCH 05/33] =?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 06/33] =?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 07/33] =?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 08/33] =?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 09/33] =?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 10/33] =?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 11/33] =?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 12/33] =?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 13/33] =?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 14/33] =?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 15/33] =?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 16/33] =?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 17/33] =?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 18/33] =?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 // 审核通过 From 55e2e6abdea194ca86fef34e5ca3424706eef0d5 Mon Sep 17 00:00:00 2001 From: sian Date: Wed, 8 Feb 2023 15:44:31 +0800 Subject: [PATCH 19/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jd/task.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jd/task.go b/jd/task.go index a8bf25c..5175506 100644 --- a/jd/task.go +++ b/jd/task.go @@ -39,8 +39,9 @@ func (t *task) RefreshToken(ctx context.Context) error { } type ReplySkuAddStatus struct { - Total uint - Count uint + Total uint + Count uint + StartTime int64 } // GetSkuAddStatus @Title 获取同步状态 From acb766a5f9d73155c1a26723f25b39fa356d9b0c Mon Sep 17 00:00:00 2001 From: kanade Date: Thu, 9 Feb 2023 17:15:32 +0800 Subject: [PATCH 20/33] =?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 --- supplier/afsAudit.go | 84 ++++++++++++++++++++++++++++++++++++++++++++ supplier/supplier.go | 1 + 2 files changed, 85 insertions(+) create mode 100644 supplier/afsAudit.go diff --git a/supplier/afsAudit.go b/supplier/afsAudit.go new file mode 100644 index 0000000..300e201 --- /dev/null +++ b/supplier/afsAudit.go @@ -0,0 +1,84 @@ +package supplier + +import ( + "context" + "git.oa00.com/supply-chain/service/client" + "git.oa00.com/supply-chain/service/lib/bean" + "github.com/shopspring/decimal" +) + +type afsAudit struct { +} +type ArgsAfsAuditLists struct { + Search AfsAuditSearch + Page bean.Page +} +type AfsAuditSearch struct { + Status uint // 0=全部 1=待审核 2=审核通过 3=审核驳回 + AfsSn string + OrderSubSn string + CreatedStartDate string + CreatedEndDate string +} + +type ReplyAfsAuditLists struct { + Lists []AfsAuditItem + Total int64 +} +type AfsAuditItem struct { + Id uint `json:"id"` + AfsSn uint64 `json:"afsSn"` + OrderSubSn uint64 `json:"orderSubSn"` + Status uint `json:"status"` + Quantity uint `json:"quantity"` + OrderSubAfsId uint `json:"orderSubAfsId"` + RefundFee decimal.Decimal `json:"refundFee"` + Remark string `json:"remark"` + Result string `json:"result"` + Notes string `json:"notes"` + RefundId uint `json:"refundId"` + ApplyUserId uint `json:"applyUserId"` + AuditUserId uint `json:"auditUserId"` + AuditAt int64 `json:"auditAt"` +} + +// Lists @Title 售后审核列表 +func (a *afsAudit) Lists(ctx context.Context, args ArgsAfsLists) (reply ReplyAfsLists, err error) { + xClient, err := client.GetClient(a) + if err != nil { + return + } + err = xClient.Call(ctx, "Lists", args, &reply) + return +} + +type ArgsAfsAuditAdopt struct { + AuditUserId uint + AfsAuditId uint +} + +// Adopt @Title 审核通过 +func (a *afsAudit) Adopt(ctx context.Context, args ArgsAfsAuditAdopt) error { + xClient, err := client.GetClient(a) + if err != nil { + return err + } + reply := 0 + return xClient.Call(ctx, "Adopt", args, &reply) +} + +type ArgsAfsAuditReject struct { + AuditUserId uint + Remark string + AfsAuditId uint +} + +// Reject @Title 审核驳回 +func (a *afsAudit) Reject(ctx context.Context, args ArgsAfsAuditReject) error { + xClient, err := client.GetClient(a) + if err != nil { + return err + } + reply := 0 + return xClient.Call(ctx, "Reject", args, &reply) +} diff --git a/supplier/supplier.go b/supplier/supplier.go index 746c54d..306f22f 100644 --- a/supplier/supplier.go +++ b/supplier/supplier.go @@ -17,6 +17,7 @@ type Supplier struct { LogisticsCompany logisticsCompany ReturnAddress returnAddress Afs afs + AfsAudit afsAudit BatchGoods batch.Goods } From 25c4f065314c2c5e38de51057c1d3a07a99306c4 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 9 Feb 2023 17:17:01 +0800 Subject: [PATCH 21/33] =?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 400d922..41a7929 100644 --- a/supplier/goods.go +++ b/supplier/goods.go @@ -180,7 +180,7 @@ func (g *goods) ReHandle(ctx context.Context, goodsIds []uint) (reply []AdoptIte type ReplyByIdItem struct { SkuId uint `json:"skuId"` - SupplierId uint `json:"supplierIds"` + SupplierId uint `json:"supplierId"` SupplierName string `json:"supplierName"` } From a511f376e29125b13c699b3af4e25685350249e7 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 10 Feb 2023 09:33:19 +0800 Subject: [PATCH 22/33] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supplier/afsAudit.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/supplier/afsAudit.go b/supplier/afsAudit.go index 300e201..24dcaa5 100644 --- a/supplier/afsAudit.go +++ b/supplier/afsAudit.go @@ -82,3 +82,18 @@ func (a *afsAudit) Reject(ctx context.Context, args ArgsAfsAuditReject) error { reply := 0 return xClient.Call(ctx, "Reject", args, &reply) } + +type ArgsSetAfsAuditPrice struct { + Price decimal.Decimal + Switch uint +} + +// SetAfsAuditPrice @Title 设置需要审核金额 +func (a *afsAudit) SetAfsAuditPrice(ctx context.Context, args ArgsSetAfsAuditPrice) error { + xClient, err := client.GetClient(a) + if err != nil { + return err + } + reply := 0 + return xClient.Call(ctx, "SetAfsAuditPrice", args, &reply) +} From 7f24bf8fa14b3a5f6ade826d64ec43f4efef6f43 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 10 Feb 2023 09:39:08 +0800 Subject: [PATCH 23/33] =?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/afsAudit.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/supplier/afsAudit.go b/supplier/afsAudit.go index 24dcaa5..dedd1a0 100644 --- a/supplier/afsAudit.go +++ b/supplier/afsAudit.go @@ -7,6 +7,11 @@ import ( "github.com/shopspring/decimal" ) +const ( + AfsAuditSwitchOn = 1 // 开 + AfsAuditSwitchOff = 2 // 关 +) + type afsAudit struct { } type ArgsAfsAuditLists struct { From c220a0410b97dae740307804d20c08f454058894 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 10 Feb 2023 09:52:56 +0800 Subject: [PATCH 24/33] =?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/afsAudit.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supplier/afsAudit.go b/supplier/afsAudit.go index dedd1a0..647f59b 100644 --- a/supplier/afsAudit.go +++ b/supplier/afsAudit.go @@ -48,7 +48,7 @@ type AfsAuditItem struct { } // Lists @Title 售后审核列表 -func (a *afsAudit) Lists(ctx context.Context, args ArgsAfsLists) (reply ReplyAfsLists, err error) { +func (a *afsAudit) Lists(ctx context.Context, args ArgsAfsAuditLists) (reply ReplyAfsAuditLists, err error) { xClient, err := client.GetClient(a) if err != nil { return From f8b767507b35a55bb9d36a30042e2c590dcfa36a Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 10 Feb 2023 10:12:50 +0800 Subject: [PATCH 25/33] =?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/afsAudit.go | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/supplier/afsAudit.go b/supplier/afsAudit.go index 647f59b..185b8c1 100644 --- a/supplier/afsAudit.go +++ b/supplier/afsAudit.go @@ -93,12 +93,28 @@ type ArgsSetAfsAuditPrice struct { Switch uint } -// SetAfsAuditPrice @Title 设置需要审核金额 -func (a *afsAudit) SetAfsAuditPrice(ctx context.Context, args ArgsSetAfsAuditPrice) error { +// SetAfsAuditConfig @Title 设置售后审核配置 +func (a *afsAudit) SetAfsAuditConfig(ctx context.Context, args ArgsSetAfsAuditPrice) error { xClient, err := client.GetClient(a) if err != nil { return err } reply := 0 - return xClient.Call(ctx, "SetAfsAuditPrice", args, &reply) + return xClient.Call(ctx, "SetAfsAuditConfig", args, &reply) +} + +type ReplyAfsAuditConfig struct { + Price decimal.Decimal + Switch uint +} + +// GetAfsAuditConfig @Title 获取售后审核配置 +func (a *afsAudit) GetAfsAuditConfig(ctx context.Context) (reply ReplyAfsAuditConfig, err error) { + xClient, err := client.GetClient(a) + if err != nil { + return + } + args := 0 + err = xClient.Call(ctx, "GetAfsAuditConfig", args, &reply) + return } From 5fc172010d685058d6a27a84bc78ef5c0007f8b0 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 10 Feb 2023 11:21:07 +0800 Subject: [PATCH 26/33] =?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/afsAudit.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/supplier/afsAudit.go b/supplier/afsAudit.go index 185b8c1..a14f4b3 100644 --- a/supplier/afsAudit.go +++ b/supplier/afsAudit.go @@ -34,6 +34,7 @@ type AfsAuditItem struct { Id uint `json:"id"` AfsSn uint64 `json:"afsSn"` OrderSubSn uint64 `json:"orderSubSn"` + SkuName string `json:"skuName"` Status uint `json:"status"` Quantity uint `json:"quantity"` OrderSubAfsId uint `json:"orderSubAfsId"` @@ -41,9 +42,6 @@ type AfsAuditItem struct { Remark string `json:"remark"` Result string `json:"result"` Notes string `json:"notes"` - RefundId uint `json:"refundId"` - ApplyUserId uint `json:"applyUserId"` - AuditUserId uint `json:"auditUserId"` AuditAt int64 `json:"auditAt"` } From a9599eb0a0242d4e8dbd3efc51dbab84af9fe924 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 10 Feb 2023 11:24:34 +0800 Subject: [PATCH 27/33] =?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 08ce9dd..4d4bad3 100644 --- a/supplier/afs.go +++ b/supplier/afs.go @@ -32,10 +32,10 @@ type AfsItem struct { Id uint `json:"id"` AfsSn string `json:"afsSn"` OrderSubSn string `json:"orderSubSn"` - SkuId uint `json:"skuId"` SkuName string `json:"skuName"` Quantity uint `json:"quantity"` Status uint `json:"status"` + AuditStatus uint `json:"manageStatus"` Result string `json:"result"` OrderFee decimal.Decimal `json:"orderFee"` CreatedAt int64 `json:"createdAt"` From 00eeecef7b777120775473119d5cfba3ce954905 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 10 Feb 2023 11:28:30 +0800 Subject: [PATCH 28/33] =?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 | 1 + supplier/afsAudit.go | 1 + 2 files changed, 2 insertions(+) diff --git a/supplier/afs.go b/supplier/afs.go index 4d4bad3..94adc87 100644 --- a/supplier/afs.go +++ b/supplier/afs.go @@ -57,6 +57,7 @@ type ReplyAfsDetail struct { Id uint `json:"id"` AfsSn string `json:"afsSn"` Status uint `json:"status"` + AuditStatus uint `json:"auditStatus"` ApproveNotes string `json:"approveNotes"` Result string `json:"result"` CreatedAt int64 `json:"createdAt"` diff --git a/supplier/afsAudit.go b/supplier/afsAudit.go index a14f4b3..c5af126 100644 --- a/supplier/afsAudit.go +++ b/supplier/afsAudit.go @@ -43,6 +43,7 @@ type AfsAuditItem struct { Result string `json:"result"` Notes string `json:"notes"` AuditAt int64 `json:"auditAt"` + CreatedAt int64 `json:"createdAt"` } // Lists @Title 售后审核列表 From 77542de578d907a36e2b3d5c0f1c85b2673bde6d Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 10 Feb 2023 14:01:53 +0800 Subject: [PATCH 29/33] =?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 | 1 + 1 file changed, 1 insertion(+) diff --git a/supplier/afs.go b/supplier/afs.go index 94adc87..df04bec 100644 --- a/supplier/afs.go +++ b/supplier/afs.go @@ -55,6 +55,7 @@ func (a *afs) Lists(ctx context.Context, args ArgsAfsLists) (reply ReplyAfsLists type ReplyAfsDetail struct { Id uint `json:"id"` + AuditId uint `json:"auditId"` AfsSn string `json:"afsSn"` Status uint `json:"status"` AuditStatus uint `json:"auditStatus"` From 40663ccfbc238db1d82e064eb043bf473db1f087 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 10 Feb 2023 14:16:05 +0800 Subject: [PATCH 30/33] =?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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/supplier/afs.go b/supplier/afs.go index df04bec..0a2c308 100644 --- a/supplier/afs.go +++ b/supplier/afs.go @@ -176,9 +176,10 @@ func (a *afs) Refund(ctx context.Context, args ArgsAfsRefund) (err error) { } type ArgsAfsCompensate struct { - AfsSn string `json:"afsSn"` - RefundFee decimal.Decimal `json:"refundFee"` - Notes string `json:"notes"` + ApplyUserId uint `json:"applyUserId"` + AfsSn string `json:"afsSn"` + RefundFee decimal.Decimal `json:"refundFee"` + Notes string `json:"notes"` } // Compensate @Title 订单赔偿 From dad4fdd766e3e35caf7c057205813a962cf709f1 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 10 Feb 2023 14:17:43 +0800 Subject: [PATCH 31/33] =?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 | 1 + 1 file changed, 1 insertion(+) diff --git a/supplier/afs.go b/supplier/afs.go index 0a2c308..ec1b7b1 100644 --- a/supplier/afs.go +++ b/supplier/afs.go @@ -180,6 +180,7 @@ type ArgsAfsCompensate struct { AfsSn string `json:"afsSn"` RefundFee decimal.Decimal `json:"refundFee"` Notes string `json:"notes"` + RefundId uint `json:"refundId"` } // Compensate @Title 订单赔偿 From 9eaa0a3c420f484bd0e66e985986fa63075e3fca Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 10 Feb 2023 16:01:34 +0800 Subject: [PATCH 32/33] bug fix --- supply/channel/afterService.go | 1 + 1 file changed, 1 insertion(+) diff --git a/supply/channel/afterService.go b/supply/channel/afterService.go index befce94..010e569 100644 --- a/supply/channel/afterService.go +++ b/supply/channel/afterService.go @@ -202,6 +202,7 @@ type ReplyAfterServiceDetail struct { LogisticsCompany string `json:"logisticsCompany"` WaybillCode string `json:"waybillCode"` SendAt int64 `json:"sendAt"` + ReturnAddress string `json:"returnAddress"` PackageSend uint `json:"packageSend"` AfsPackageSend AfsPackageSend `json:"afsPackageSend"` } From ca31170b286983410bd75a3861a041bbf60095d7 Mon Sep 17 00:00:00 2001 From: sian Date: Mon, 13 Feb 2023 16:33:48 +0800 Subject: [PATCH 33/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E7=9B=AE?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jd/category.go | 1 + 1 file changed, 1 insertion(+) diff --git a/jd/category.go b/jd/category.go index 7ad32bb..414d287 100644 --- a/jd/category.go +++ b/jd/category.go @@ -10,6 +10,7 @@ type category struct { } type ArgsCategoryList struct { ThirdCategoryId uint + IsMatch uint // 是否匹配 0=全部 1=匹配 2=没匹配 Page bean.Page }