Merge branch 'alibaba'

upstream/alibaba/ali_order.go

@@ -65,7 +65,7 @@ type OrderCreateRes struct {
 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 {
+	for k, v := range req.CargoParam {
 		req.CargoParam[k].OutShopCode = "1"
 		req.CargoParam[k].OutItemCode = gconv.String(v.OfferId)
 		req.CargoParam[k].Channel = "other"
@@ -238,24 +238,17 @@ func (s *orderAli) Pay(ctx context.Context, orderSn string) (res *CommonRes, err
 	return
 }
 
-type ModelResult struct {
-	CommonRes
-	OrderPreviewResuslt []OrderBeforeItem `json:"orderPreviewResuslt"`
-}
 
 type OrderBeforeRes struct {
-	ModelResult struct {
-		CommonRes
-		OrderPreviewResuslt []OrderBeforeItem `json:"orderPreviewResuslt"`
-	} `json:"modelResult"`
+	CommonRes
+	OrderPreviewResuslt []OrderBeforeItem `json:"orderPreviewResuslt"`
 }
 
 type OrderBeforeItem struct {
-	SumPayment           int64  `json:"sumPayment"`           //订单总费用, 单位为分
-	SumPaymentNoCarriage int64  `json:"sumPaymentNoCarriage"` //不包含运费的货品总费用, 单位为分.
-	AdditionalFee        int64  `json:"additionalFee"`        //附加费,单位，分
-	SumCarriage          int64  `json:"sumCarriage"`          //总运费信息, 单位为分.
-	ResultCode           string `json:"resultCode"`           //
+	SumPayment           int64 `json:"sumPayment"`           //订单总费用, 单位为分
+	SumPaymentNoCarriage int64 `json:"sumPaymentNoCarriage"` //不包含运费的货品总费用, 单位为分.
+	SumCarriage          int64 `json:"sumCarriage"`          //总运费信息, 单位为分.
+	Status               bool  `json:"status"`               //
 	ShopPromotionList    []struct { //可用店铺级别优惠列表
 		PromotionId int64 `json:"promotionId"` //优惠券ID
 	} `json:"shopPromotionList"`      //规格信息
@@ -273,7 +266,7 @@ func (s *orderAli) Before(ctx context.Context, req *OrderCommonReq) (res *OrderB
 	method := "com.alibaba.trade/alibaba.createOrder.preview"
 
 	//添加分销关系
-	for k,v:= range req.CargoParam {
+	for k, v := range req.CargoParam {
 		req.CargoParam[k].OutShopCode = "1"
 		req.CargoParam[k].OutItemCode = gconv.String(v.OfferId)
 		req.CargoParam[k].Channel = "other"