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

otosaas/commodity.go

@@ -85,6 +85,7 @@ type ReplyCommodityInfo struct {
 	Status             uint               `json:"status"`
 	Skus               []SkuItem          `json:"skus"`
 	Imgs               []CommodityImgItem `json:"imgs"`
+	Content            string             `json:"content"`
 }
 
 type CommodityImgItem struct {

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)

wholesale/order.go

@@ -193,6 +193,7 @@ type OrderSkuItem struct {
 	SkuId       uint
 	SourceSkuId string
 	Price       decimal.Decimal
+	SupplyPrice decimal.Decimal
 	AdjustType  uint
 	AdjustPrice decimal.Decimal
 	Rate        decimal.Decimal

wholesale/skuAudit.go

@@ -79,6 +79,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)