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查询用户信息 diff --git a/otosaas/callback.go b/otosaas/callback.go new file mode 100644 index 0000000..214f334 --- /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 *callback) 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 *callback) 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 } 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 // 供应商订单号