Merge branch 'alibaba'

upstream/alibaba/ali_goods.go

@@ -147,7 +147,7 @@ type GoodsInfoRes struct {
 			AttributeName string `json:"attributeName"`
 			Value         string `json:"value"`
 			IsCustom      bool   `json:"isCustom"`
-		} `json:"attributes"`
+		} `json:"productAttribute"`
 		Status string `json:"status"`
 	} `json:"productInfo"`
 }

upstream/alibaba/ali_order.go

@@ -270,7 +270,7 @@ type OrderBeforeItem struct {
 
 //Before 验证订单商品
 func (s *orderAli) Before(ctx context.Context, req *OrderCommonReq) (res *OrderBeforeRes, err error) {
-	method := "com.alibaba.fenxiao/alibaba.trade.createFenxiaoOrder.preview"
+	method := "com.alibaba.trade/alibaba.createOrder.preview"
 
 	//添加分销关系
 	for k,v:= range req.CargoParam {