Merge branch 'master' of git.oa00.com:supply-chain/service

customer/user.go

@@ -153,9 +153,10 @@ func (u *user) ServiceInfo(ctx context.Context, args ArgsUserServiceInfo) (reply
 }
 
 type UserInfoItem struct {
-	Id    uint   `json:"id"`
+	Id      uint   `json:"id"`
-	Name  string `json:"name"`
+	Name    string `json:"name"`
-	Phone string `json:"phone"`
+	Phone   string `json:"phone"`
+	Liaison string `json:"liaison"`
 }
 
 // FindByIds @Title 根据用户Ids查询用户信息

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
+}

otosaas/otosaas.go

@@ -1,6 +1,7 @@
 package otosaas
 
 type OtoSaas struct {
+	Callback  callback
 	Category  category
 	Commodity commodity
 }

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 // 供应商订单号