京东增加字段

upstream/jingdong/jingdong_order.go

@@ -74,14 +74,18 @@ type OrderDetailBase struct {
 }
 
 //OrderDetailRes 订单详情
+// jdOrderState 京东状态
+// 1.新单 2.等待支付 3.等待支付确认 4.延迟付款确认 5.订单暂停 6.店长最终审核 7.等待打印 8.等待出库 9.等待打包 10.等待发货
+// 11.自提途中 12.上门提货 13.自提退货 14.确认自提 16.等待确认收货 17.配送退货 18.货到付款确认 19.已完成 21.收款确认 22.锁定
 type OrderDetailRes struct {
 	CommonRes
 	Result struct {
-		SubmitState int                 `json:"submitState"` //预占确认状态。0没确认预占。   1已确认预占。
-		Type        int                 `json:"type"`        //订单类型。1是父订单   2是子订单
-		OrderState  int                 `json:"orderState"`  //订单状态。0为取消订单  1为有效
-		POrder      OrderDetailPOrder   `json:"pOrder"`
-		COrder      []OrderDetailCOrder `json:"cOrder"`
+		JdOrderState int                 `json:"jdOrderState"` //京东状态
+		SubmitState  int                 `json:"submitState"`  //预占确认状态。0没确认预占。   1已确认预占。
+		Type         int                 `json:"type"`         //订单类型。1是父订单   2是子订单
+		OrderState   int                 `json:"orderState"`   //订单状态。0为取消订单  1为有效
+		POrder       OrderDetailPOrder   `json:"pOrder"`
+		COrder       []OrderDetailCOrder `json:"cOrder"`
 	} `json:"result"`
 }
 
@@ -90,8 +94,8 @@ type OrderDetailPOrder struct {
 	Freight         float64        `json:"freight"`         //运费
 	OrderPrice      float64        `json:"orderPrice"`      //订单总金额
 	OrderNakedPrice float64        `json:"orderNakedPrice"` //订单未含税金额
-	Sku             []OrderSkuItem `json:"sku"`             //商品列表
 	OrderTaxPrice   float64        `json:"orderTaxPrice"`   //订单税额
+	Sku             []OrderSkuItem `json:"sku"`             //商品列表
 }
 
 type OrderDetailCOrder struct {
@@ -104,13 +108,16 @@ type OrderDetailCOrder struct {
 	OrderPrice      float64        `json:"orderPrice"`
 	OrderNakedPrice float64        `json:"orderNakedPrice"`
 	Type            int            `json:"type"` //商品类型。   0 普通、1 附件、2 赠品、3延保
-	Sku             []OrderSkuItem `json:"sku"`
 	OrderTaxPrice   float64        `json:"orderTaxPrice"`
+	Sku             []OrderSkuItem `json:"sku"`
 }
 
 type OrderDetailChild struct {
 	CommonRes
-	Result OrderDetailCOrder `json:"result"`
+	Result struct {
+		JdOrderState int `json:"jdOrderState"` //京东状态
+		OrderDetailCOrder
+	} `json:"result"`
 }
 
 //OrderFreightRes 运费
@@ -182,6 +189,7 @@ func (*orderJD) Detail(ctx context.Context, OrderID string) (res *OrderDetailRes
 	method := "order/selectJdOrder"
 	param := g.Map{
 		"jdOrderId": OrderID,
+		"queryExts": "jdOrderState",
 	}
 
 	result, err := server.requestApi(ctx, method, param)
@@ -201,7 +209,7 @@ func (*orderJD) Detail(ctx context.Context, OrderID string) (res *OrderDetailRes
 		res.CommonRes = child.CommonRes
 		res.Result.Type = child.Result.Type
 		res.Result.SubmitState = child.Result.SubmitState
-		res.Result.OrderState = child.Result.OrderState
+		res.Result.JdOrderState = child.Result.JdOrderState
 
 		res.Result.POrder = OrderDetailPOrder{
 			JdOrderId:       child.Result.JdOrderId,
@@ -211,7 +219,8 @@ func (*orderJD) Detail(ctx context.Context, OrderID string) (res *OrderDetailRes
 			OrderTaxPrice:   child.Result.OrderTaxPrice,
 			Sku:             child.Result.Sku,
 		}
-		res.Result.COrder = append(res.Result.COrder, child.Result)
+		child.Result.OrderDetailCOrder.POrder = child.Result.OrderDetailCOrder.JdOrderId
+		res.Result.COrder = append(res.Result.COrder, child.Result.OrderDetailCOrder)
 	}
 	return
 }