Merge branch 'alibaba'

upstream/alibaba/ali_order.go

@@ -63,7 +63,12 @@ type OrderCreateRes struct {
 //Create 下单
 func (s *orderAli) Create(ctx context.Context, req *OrderCommonReq) (res *OrderCreateRes, err error) {
 	method := "com.alibaba.trade/alibaba.trade.fenxiaoOrder.create"
-
+	//添加分销关系
+	for k,v:= range req.CargoParam {
+		req.CargoParam[k].OutShopCode = "1"
+		req.CargoParam[k].OutItemCode = v.OutItemCode
+		req.CargoParam[k].Channel = "other"
+	}
 	result, err := server.Post(ctx, method, g.Map{
 		"access_token":   server.AccessToken,
 		"addressParam":   gjson.New(req.AddressParam).MustToJsonString(),
@@ -266,6 +271,13 @@ type OrderBeforeItem struct {
 func (s *orderAli) Before(ctx context.Context, req *OrderCommonReq) (res *OrderBeforeRes, err error) {
 	method := "com.alibaba.fenxiao/alibaba.trade.createFenxiaoOrder.preview"
 
+	//添加分销关系
+	for k,v:= range req.CargoParam {
+		req.CargoParam[k].OutShopCode = "1"
+		req.CargoParam[k].OutItemCode = v.OutItemCode
+		req.CargoParam[k].Channel = "other"
+	}
+
 	result, err := server.Post(ctx, method, g.Map{
 		"access_token":   server.AccessToken,
 		"addressParam":   gjson.New(req.AddressParam).MustToJsonString(),