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/supplier/batch/goods.go b/supplier/batch/goods.go index 9c38df0..17a128f 100644 --- a/supplier/batch/goods.go +++ b/supplier/batch/goods.go @@ -3,12 +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 } type goods struct { diff --git a/supplier/batch/order/order.go b/supplier/batch/order/order.go new file mode 100644 index 0000000..cd511f4 --- /dev/null +++ b/supplier/batch/order/order.go @@ -0,0 +1,31 @@ +package order + +import ( + "git.oa00.com/supply-chain/service/client" + "github.com/shopspring/decimal" + "golang.org/x/net/context" +) + +type Order struct { + order +} + +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 +} diff --git a/wholesale/order.go b/wholesale/order.go index f511bcd..2010712 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 + Rate decimal.Decimal Quantity uint PackageRate uint }