From c16783e77d8ae1ebe7a3a7887e9ac010ca8667a6 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 22 Dec 2022 11:26:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=9F=E6=9C=9B?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wholesale/channel/order.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/wholesale/channel/order.go b/wholesale/channel/order.go index 3061fca..246d5c5 100644 --- a/wholesale/channel/order.go +++ b/wholesale/channel/order.go @@ -54,10 +54,11 @@ type ArgsOrderSubmit struct { } type Receiver struct { - Name string // 姓名 - Mobile string // 手机号 - Email string // 邮箱 - ZipCode string // 邮编 + Name string // 姓名 + Mobile string // 手机号 + HopeStockOutDate string // 期望发货日期 + Email string // 邮箱 + ZipCode string // 邮编 } type ReplyOrderSubmit struct { From e7ad4b1478f6469ba91925db589018319e205500 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 22 Dec 2022 13:05:04 +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 --- wholesale/channel/order.go | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/wholesale/channel/order.go b/wholesale/channel/order.go index 246d5c5..e7b6fcb 100644 --- a/wholesale/channel/order.go +++ b/wholesale/channel/order.go @@ -145,10 +145,16 @@ type OrderItem struct { FinishAt int64 `json:"finishAt"` StockOutAt int64 `json:"stockOutAt"` CloseAt int64 `json:"closeAt"` - Skus []OrderSkuItem `json:"skus"` + Skus []OrderSku `json:"skus"` + Packages []OrderPackage `json:"packages"` } -type OrderSkuItem struct { +type OrderPackage struct { + LogisticsName string `json:"logisticsName"` + WaybillCode string `json:"waybillCode"` +} + +type OrderSku struct { Img string `json:"img"` SkuName string `json:"skuName"` SkuId uint `json:"skuId"` @@ -168,3 +174,13 @@ func (o *order) Lists(ctx context.Context, channelId string, args ArgsOrderLists err = xClient.Call(context.WithValue(ctx, share.ReqMetaDataKey, map[string]string{"channelId": channelId}), "Lists", args, &reply) return } + +// SubDetail @Title 子订单详情 +func (o *order) SubDetail(ctx context.Context, channelId, orderSn string) (reply OrderItem, err error) { + xClient, err := client.GetClient(o) + if err != nil { + return + } + err = xClient.Call(context.WithValue(ctx, share.ReqMetaDataKey, map[string]string{"channelId": channelId}), "SubDetail", orderSn, &reply) + return +} From 8b9d19b65589bd85927f318b4d04d5f252231bf3 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 22 Dec 2022 13:16:32 +0800 Subject: [PATCH 3/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 --- wholesale/channel/order.go | 1 + 1 file changed, 1 insertion(+) diff --git a/wholesale/channel/order.go b/wholesale/channel/order.go index e7b6fcb..e05cde9 100644 --- a/wholesale/channel/order.go +++ b/wholesale/channel/order.go @@ -135,6 +135,7 @@ type OrderItem struct { Id uint `json:"id"` ReceiverName string `json:"receiverName"` ReceiverMobile string `json:"receiverMobile"` + Address string `json:"address"` OrderSubSn string `json:"orderSubSn"` FreightFee decimal.Decimal `json:"freightFee"` OrderFee decimal.Decimal `json:"orderFee"` From 39068492d13a5ceb86b233871cfad45c7fbeeaf1 Mon Sep 17 00:00:00 2001 From: sian Date: Fri, 23 Dec 2022 09:24:12 +0800 Subject: [PATCH 4/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 --- wholesale/channel/order.go | 1 + 1 file changed, 1 insertion(+) diff --git a/wholesale/channel/order.go b/wholesale/channel/order.go index e05cde9..03c9719 100644 --- a/wholesale/channel/order.go +++ b/wholesale/channel/order.go @@ -148,6 +148,7 @@ type OrderItem struct { CloseAt int64 `json:"closeAt"` Skus []OrderSku `json:"skus"` Packages []OrderPackage `json:"packages"` + ExpireAt int64 `json:"expireAt"` } type OrderPackage struct {