From 39367667df4e9b82d20a83383e2a6456fa2be720 Mon Sep 17 00:00:00 2001 From: sian Date: Mon, 27 Feb 2023 16:25:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=96=B0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supply/channel/afterService.go | 1 + 1 file changed, 1 insertion(+) diff --git a/supply/channel/afterService.go b/supply/channel/afterService.go index e3d70c1..16c96ff 100644 --- a/supply/channel/afterService.go +++ b/supply/channel/afterService.go @@ -206,6 +206,7 @@ type ReplyAfterServiceDetail struct { PackageSend uint `json:"packageSend"` AfsPackageSend AfsPackageSend `json:"afsPackageSend"` RefundFee decimal.Decimal `json:"refundFee"` + NewOrderSubSn string `json:"NewOrderSubSn"` } type AfsPackageSend struct { Name string `json:"name"` From 9a80c0bfca819a83ffb4dfc6caac252407cac403 Mon Sep 17 00:00:00 2001 From: sian Date: Mon, 27 Feb 2023 16:58:06 +0800 Subject: [PATCH 2/4] =?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 6599b80..3f5799f 100644 --- a/supply/afterService.go +++ b/supply/afterService.go @@ -230,6 +230,7 @@ type ReplyAfterServiceDetail struct { PackageSend uint `json:"packageSend"` AfsPackageSend AfsPackageSend `json:"afsPackageSend"` OrderSubSn uint64 `json:"orderSubSn"` + SourceOrderSubSn string `json:"sourceOrderSubSn"` SourceId uint `json:"sourceId"` ChannelId uint `json:"channelId"` } From 6839e6a9336f96f918430328ed08aa3c7edcf2f5 Mon Sep 17 00:00:00 2001 From: sian Date: Tue, 28 Feb 2023 17:37:18 +0800 Subject: [PATCH 3/4] bug fix --- supply/afterService.go | 49 ++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/supply/afterService.go b/supply/afterService.go index 3f5799f..cb86f78 100644 --- a/supply/afterService.go +++ b/supply/afterService.go @@ -208,34 +208,31 @@ func (a *afterService) NewOrder(ctx context.Context, args ArgsAfterServiceNewOrd type ReplyAfterServiceDetail struct { Id uint `json:"id"` - AfsSn string `json:"afsSn"` - Status uint `json:"status"` - ApproveNotes string `json:"approveNotes"` - Result string `json:"result"` - CreatedAt int64 `json:"createdAt"` - UpdatedAt int64 `json:"updatedAt"` - SkuName string `json:"skuName"` - ImgUrl string `json:"imgUrl"` - SkuId uint `json:"skuId"` - SupplySkuId uint `json:"supplySkuId"` - Price decimal.Decimal `json:"price"` - SupplyPrice decimal.Decimal `json:"supplyPrice"` - Quantity uint `json:"quantity"` - HopeTypeName string `json:"hopeTypeName"` - TypeReasonName string `json:"typeReasonName"` - Imgs []string `json:"imgs"` - LogisticsCompany string `json:"logisticsCompany"` - WaybillCode string `json:"waybillCode"` - SendAt int64 `json:"sendAt"` - PackageSend uint `json:"packageSend"` - AfsPackageSend AfsPackageSend `json:"afsPackageSend"` - OrderSubSn uint64 `json:"orderSubSn"` - SourceOrderSubSn string `json:"sourceOrderSubSn"` - SourceId uint `json:"sourceId"` - ChannelId uint `json:"channelId"` + AfsSn string `json:"afsSn"` // 售后单号 + Status uint `json:"status"` // 状态 + ApproveNotes string `json:"approveNotes"` // 备注 + Result string `json:"result"` // 处理结果 + CreatedAt int64 `json:"createdAt"` // 创建时间 + UpdatedAt int64 `json:"updatedAt"` // 更新时间 + SkuName string `json:"skuName"` // 商品名称 + ImgUrl string `json:"imgUrl"` // 商品图片 + SkuId uint `json:"skuId"` // skuId + SupplySkuId uint `json:"supplySkuId"` // 供应商skuId + Price decimal.Decimal `json:"price"` // 采购单价 + SupplyPrice decimal.Decimal `json:"supplyPrice"` // 供货价 + Quantity uint `json:"quantity"` // 数量 + HopeTypeName string `json:"hopeTypeName"` // 期望售后类型 + TypeReasonName string `json:"typeReasonName"` // 售后原因 + Imgs []string `json:"imgs"` // 售后图片 + PackageSend uint `json:"packageSend"` // 发货状态 + AfsPackageSend AfsPackageSend `json:"afsPackageSend"` // 售后信息 + OrderSubSn uint64 `json:"orderSubSn"` // 订单号 + SourceOrderSubSn string `json:"sourceOrderSubSn"` // 供应商的订单号 + SourceId uint `json:"sourceId"` // 供应商id + ChannelId uint `json:"channelId"` // 客户id } type AfsPackageSend struct { - Name string `json:"name"` + Name string `json:"name"` // Mobile string `json:"mobile"` ZipCode string `json:"zipCode"` Address string `json:"address"` From 4b6858698403915771e1a031ccb188e07b9e2a75 Mon Sep 17 00:00:00 2001 From: sian Date: Wed, 1 Mar 2023 09:17:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supply/afterService.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/supply/afterService.go b/supply/afterService.go index cb86f78..ba58537 100644 --- a/supply/afterService.go +++ b/supply/afterService.go @@ -232,13 +232,13 @@ type ReplyAfterServiceDetail struct { ChannelId uint `json:"channelId"` // 客户id } type AfsPackageSend struct { - Name string `json:"name"` // - Mobile string `json:"mobile"` + Name string `json:"name"` // 售后收件人 + Mobile string `json:"mobile"` /// 售后手机号 ZipCode string `json:"zipCode"` - Address string `json:"address"` - LogisticsCompany string `json:"logisticsCompany"` - WaybillCode string `json:"waybillCode"` - SendGoodsDate int64 `json:"sendGoodsDate"` + Address string `json:"address"` // 售后地址 + LogisticsCompany string `json:"logisticsCompany"` // 快递公司 + WaybillCode string `json:"waybillCode"` // 运单号 + SendGoodsDate int64 `json:"sendGoodsDate"` // 发货时间 } // Detail @Title 售后详情