From 51c533534fda894367470b67a38629d1025fe558 Mon Sep 17 00:00:00 2001
From: sian <sian@akuhome.com>
Date: Tue, 27 Dec 2022 10:31:47 +0800
Subject: [PATCH 1/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/order.go | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/supply/order.go b/supply/order.go
index 0deaee1..4ba27a5 100644
--- a/supply/order.go
+++ b/supply/order.go
@@ -83,6 +83,27 @@ func (o *order) StockOut(ctx context.Context, args ArgsOrderStockOut) (err error
 	return
 }
 
+//
+//type ArgsChangeWaybill struct {
+//	Id            uint
+//	Source        source // 商品来源
+//	SourceOrderSn string
+//	WaybillCode   string
+//	LogisticsName string
+//	LogisticsCode string
+//}
+//
+//// ChangeWaybill @Title 修改运单信息
+//func (o *order) ChangeWaybill(ctx context.Context, args ArgsChangeWaybill) (err error) {
+//	xClient, err := client.GetClient(o)
+//	if err != nil {
+//		return
+//	}
+//	reply := 0
+//	err = xClient.Call(ctx, "ChangeWaybill", args, &reply)
+//	return
+//}
+
 type ArgsOrderFinish struct {
 	Source        source // 商品来源
 	SourceOrderSn string // 供应商订单号

From 23935d7eb7d5119429f41354a3cbdcb97c916d01 Mon Sep 17 00:00:00 2001
From: sian <sian@akuhome.com>
Date: Tue, 27 Dec 2022 17:14:54 +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

---
 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 <kanade@kumo.work>
Date: Thu, 29 Dec 2022 11:01:35 +0800
Subject: [PATCH 3/4] =?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 <kanade@kumo.work>
Date: Thu, 29 Dec 2022 11:21:17 +0800
Subject: [PATCH 4/4] =?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