From 23935d7eb7d5119429f41354a3cbdcb97c916d01 Mon Sep 17 00:00:00 2001 From: sian Date: Tue, 27 Dec 2022 17:14:54 +0800 Subject: [PATCH 1/8] =?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/user.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/customer/user.go b/customer/user.go index f45d721..e43c20f 100644 --- a/customer/user.go +++ b/customer/user.go @@ -153,9 +153,10 @@ func (u *user) ServiceInfo(ctx context.Context, args ArgsUserServiceInfo) (reply } type UserInfoItem struct { - Id uint `json:"id"` - Name string `json:"name"` - Phone string `json:"phone"` + Id uint `json:"id"` + Name string `json:"name"` + Phone string `json:"phone"` + Liaison string `json:"liaison"` } // FindByIds @Title 根据用户Ids查询用户信息 From 4876acbe86315e429fcdc142afb74dd66368cde7 Mon Sep 17 00:00:00 2001 From: kanade Date: Thu, 29 Dec 2022 11:01:35 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- otosaas/callback.go | 29 +++++++++++++++++++++++++++++ otosaas/otosaas.go | 1 + 2 files changed, 30 insertions(+) create mode 100644 otosaas/callback.go diff --git a/otosaas/callback.go b/otosaas/callback.go new file mode 100644 index 0000000..bb68a2e --- /dev/null +++ b/otosaas/callback.go @@ -0,0 +1,29 @@ +package otosaas + +import ( + "context" + "git.oa00.com/supply-chain/service/client" +) + +type callback struct { +} + +// OtoSaas @Title 海旅回调 +func (c *category) OtoSaas(ctx context.Context, args string) (reply string, err error) { + xClient, err := client.GetClient(c) + if err != nil { + return + } + err = xClient.Call(ctx, "OtoSaas", args, &reply) + return +} + +// Kuaidi100 @Title 快递100回调 +func (c *category) Kuaidi100(ctx context.Context, args string) (reply string, err error) { + xClient, err := client.GetClient(c) + if err != nil { + return + } + err = xClient.Call(ctx, "Kuaidi100", args, &reply) + return +} diff --git a/otosaas/otosaas.go b/otosaas/otosaas.go index 92ab618..17885e8 100644 --- a/otosaas/otosaas.go +++ b/otosaas/otosaas.go @@ -1,6 +1,7 @@ package otosaas type OtoSaas struct { + Callback callback Category category Commodity commodity } From ed4e5ee0abc32afee3e15c483072f06b69b33ba3 Mon Sep 17 00:00:00 2001 From: kanade Date: Thu, 29 Dec 2022 11:21:17 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- otosaas/callback.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/otosaas/callback.go b/otosaas/callback.go index bb68a2e..214f334 100644 --- a/otosaas/callback.go +++ b/otosaas/callback.go @@ -9,7 +9,7 @@ type callback struct { } // OtoSaas @Title 海旅回调 -func (c *category) OtoSaas(ctx context.Context, args string) (reply string, err error) { +func (c *callback) OtoSaas(ctx context.Context, args string) (reply string, err error) { xClient, err := client.GetClient(c) if err != nil { return @@ -19,7 +19,7 @@ func (c *category) OtoSaas(ctx context.Context, args string) (reply string, err } // Kuaidi100 @Title 快递100回调 -func (c *category) Kuaidi100(ctx context.Context, args string) (reply string, err error) { +func (c *callback) Kuaidi100(ctx context.Context, args string) (reply string, err error) { xClient, err := client.GetClient(c) if err != nil { return From 567a1e46d6a97f0bd9c1b4222fc3f116c94ad541 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 29 Dec 2022 11:55:10 +0800 Subject: [PATCH 4/8] =?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/order.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wholesale/order.go b/wholesale/order.go index f511bcd..100320f 100644 --- a/wholesale/order.go +++ b/wholesale/order.go @@ -191,7 +191,11 @@ type OrderSkuItem struct { Img string Name string SkuId uint + SourceSkuId string Price decimal.Decimal + AdjustType uint + AdjustPrice decimal.Decimal + RateId decimal.Decimal Quantity uint PackageRate uint } From 367a24617bc6d4fcc6b7ab1a08b67051d7f52589 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 29 Dec 2022 13:01:13 +0800 Subject: [PATCH 5/8] =?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/order.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wholesale/order.go b/wholesale/order.go index 100320f..2010712 100644 --- a/wholesale/order.go +++ b/wholesale/order.go @@ -195,7 +195,7 @@ type OrderSkuItem struct { Price decimal.Decimal AdjustType uint AdjustPrice decimal.Decimal - RateId decimal.Decimal + Rate decimal.Decimal Quantity uint PackageRate uint } From b36c4c701eedb3934f09e8f355158330975acfe5 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 29 Dec 2022 16:40:40 +0800 Subject: [PATCH 6/8] =?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/batch/goods.go | 1 + supplier/batch/order.go | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 supplier/batch/order.go diff --git a/supplier/batch/goods.go b/supplier/batch/goods.go index 9c38df0..815a134 100644 --- a/supplier/batch/goods.go +++ b/supplier/batch/goods.go @@ -9,6 +9,7 @@ import ( type Goods struct { goods + Order order } type goods struct { diff --git a/supplier/batch/order.go b/supplier/batch/order.go new file mode 100644 index 0000000..3fb9f40 --- /dev/null +++ b/supplier/batch/order.go @@ -0,0 +1,27 @@ +package batch + +import ( + "git.oa00.com/supply-chain/service/client" + "github.com/shopspring/decimal" + "golang.org/x/net/context" +) + +type order struct { +} + +type ArgsOrderFreightFee struct { + OrderSn string + FreightFee decimal.Decimal + FreightFile string +} + +// FreightFee @Title 运费处理 +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 +} From 2bc2d1cc5d8dc4f915a9417cfa8e79e6b3d36cf6 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 29 Dec 2022 16:59:44 +0800 Subject: [PATCH 7/8] =?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/batch/goods.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supplier/batch/goods.go b/supplier/batch/goods.go index 815a134..398c8d5 100644 --- a/supplier/batch/goods.go +++ b/supplier/batch/goods.go @@ -9,7 +9,7 @@ import ( type Goods struct { goods - Order order + order } type goods struct { From 70c4574d8626dc24989b2e22a107959efdc07be9 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 29 Dec 2022 17:06:02 +0800 Subject: [PATCH 8/8] =?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/batch/goods.go | 3 ++- supplier/batch/{ => order}/order.go | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) rename supplier/batch/{ => order}/order.go (92%) diff --git a/supplier/batch/goods.go b/supplier/batch/goods.go index 398c8d5..17a128f 100644 --- a/supplier/batch/goods.go +++ b/supplier/batch/goods.go @@ -3,13 +3,14 @@ package batch import ( "git.oa00.com/supply-chain/service/client" "git.oa00.com/supply-chain/service/lib/bean" + "git.oa00.com/supply-chain/service/supplier/batch/order" "github.com/shopspring/decimal" "golang.org/x/net/context" ) type Goods struct { goods - order + Order order.Order } type goods struct { diff --git a/supplier/batch/order.go b/supplier/batch/order/order.go similarity index 92% rename from supplier/batch/order.go rename to supplier/batch/order/order.go index 3fb9f40..cd511f4 100644 --- a/supplier/batch/order.go +++ b/supplier/batch/order/order.go @@ -1,4 +1,4 @@ -package batch +package order import ( "git.oa00.com/supply-chain/service/client" @@ -6,6 +6,10 @@ import ( "golang.org/x/net/context" ) +type Order struct { + order +} + type order struct { }