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

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

supply/skuAudit.go

@@ -73,6 +73,16 @@ func (s *skuAudit) Lists(ctx context.Context, args ArgsSkuAuditLists) (reply Rep
 	return
 }
 
+// InfoEs @Title 审核详情
+func (s *skuAudit) InfoEs(ctx context.Context, skuId uint) (reply SkuAndAuditItem, err error) {
+	xClient, err := client.GetClient(s)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "InfoEs", skuId, &reply)
+	return
+}
+
 // ListsEs @Title 审核列表
 func (s *skuAudit) ListsEs(ctx context.Context, args ArgsSkuAuditEsLists) (reply ReplySkuAuditLists, err error) {
 	xClient, err := client.GetClient(s)