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
 }

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 {

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

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
 }