From 880be87bd09f202540b0a646648b2d5f6a04d1db Mon Sep 17 00:00:00 2001 From: kanade Date: Mon, 19 Dec 2022 11:25:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8B=86=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wholesale/order.go | 1 + 1 file changed, 1 insertion(+) diff --git a/wholesale/order.go b/wholesale/order.go index 3dab488..06fd403 100644 --- a/wholesale/order.go +++ b/wholesale/order.go @@ -21,6 +21,7 @@ type ArgsOrderSplit struct { type OrderSub struct { SourceOrderSn string // 供应商订单号 FreightFee decimal.Decimal // 运费 + Status uint // 订单状态 OrderFee decimal.Decimal // 订单金额 Skus []OrderSplitSkuItem // 拆分订单sku } From 4b45062b459d2fea34f78cfc98584bfbaee75e71 Mon Sep 17 00:00:00 2001 From: kanade Date: Mon, 19 Dec 2022 11:25:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wholesale/order.go | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/wholesale/order.go b/wholesale/order.go index 3dab488..9146ffa 100644 --- a/wholesale/order.go +++ b/wholesale/order.go @@ -40,3 +40,23 @@ func (o *order) Split(ctx context.Context, args ArgsOrderSplit) (err error) { err = xClient.Call(ctx, "Split", args, &reply) return } + +type ArgsOrderFreightFee struct { + Source source + OrderFreightFees []OrderFreightFee +} +type OrderFreightFee struct { + SourceOrderSn string // 供应商订单号 + FreightFee decimal.Decimal // 运费 +} + +// FreightFee @Title 运费处理 +func (o *order) FreightFee(ctx context.Context, args ArgsOrderFreightFee) { + xClient, err := client.GetClient(o) + if err != nil { + return + } + reply := 0 + err = xClient.Call(ctx, "FreightFee", args, &reply) + return +} From d64fe66f2efaf1004d5aa985aaaec682d60ffdc8 Mon Sep 17 00:00:00 2001 From: kanade Date: Mon, 19 Dec 2022 11:33:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wholesale/order.go | 1 - 1 file changed, 1 deletion(-) diff --git a/wholesale/order.go b/wholesale/order.go index 01c9ca3..9146ffa 100644 --- a/wholesale/order.go +++ b/wholesale/order.go @@ -21,7 +21,6 @@ type ArgsOrderSplit struct { type OrderSub struct { SourceOrderSn string // 供应商订单号 FreightFee decimal.Decimal // 运费 - Status uint // 订单状态 OrderFee decimal.Decimal // 订单金额 Skus []OrderSplitSkuItem // 拆分订单sku } From 39fd78e95aa56c311ab3a4982ba9632d2c06bbfc Mon Sep 17 00:00:00 2001 From: kanade Date: Mon, 19 Dec 2022 11:38:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wholesale/order.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/wholesale/order.go b/wholesale/order.go index 9146ffa..e0e8a54 100644 --- a/wholesale/order.go +++ b/wholesale/order.go @@ -51,12 +51,11 @@ type OrderFreightFee struct { } // FreightFee @Title 运费处理 -func (o *order) FreightFee(ctx context.Context, args ArgsOrderFreightFee) { +func (o *order) FreightFee(ctx context.Context, args ArgsOrderFreightFee) (err error) { xClient, err := client.GetClient(o) if err != nil { return } reply := 0 - err = xClient.Call(ctx, "FreightFee", args, &reply) - return + return xClient.Call(ctx, "FreightFee", args, &reply) }