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

customer/sku/item.go

@@ -29,14 +29,19 @@ func (i *item) Add(ctx context.Context, args ArgsSkuItemAdd) (reply []ReplySkuIt
 	return
 }
 
+type ArgsSkuItemDel struct {
+	SkuTypeId uint
+	SkuIds    []uint
+}
+
 // Del @Title 删除商品
-func (i *item) Del(ctx context.Context, ids []uint) error {
+func (i *item) Del(ctx context.Context, args ArgsSkuItemDel) error {
 	xClient, err := client.GetClient(i)
 	if err != nil {
 		return err
 	}
 	reply := 0
-	return xClient.Call(ctx, "Del", ids, &reply)
+	return xClient.Call(ctx, "Del", args, &reply)
 }
 
 type ArgsSkuItemLists struct {

supply/channel/sku.go

@@ -64,7 +64,6 @@ func (s *sku) Lists(ctx context.Context, channelId string, args ArgsSkuList) (re
 }
 
 type SkuEsSearch struct {
-	SkuId              uint            // 商品Id
 	Status             uint                     // 1=上架 2=下架
 	SkuName            string                   // 商品名称
 	BrandId            uint                     // 品牌id
@@ -79,6 +78,7 @@ type SkuEsSearch struct {
 	MinPrice           decimal.Decimal          // 最低金额
 	MinDiscount        decimal.Decimal          // 最低折扣
 	MaxDiscount        decimal.Decimal          // 最高折扣
+	Expand             []map[string]interface{} // 拓展查询
 }
 type ArgsSkuListsEs struct {
 	Search SkuEsSearch