更新唯品会包

upstream/wpc/wpc_brand.go

@@ -210,7 +210,9 @@ func (*brandWpc) List(ctx context.Context, req BrandListReq) (res *BrandListRes,
 	result, err := post(ctx, method, g.Map{
 		"request": req,
 	})
-	_ = gjson.New(result).Scan(&res)
+	_ = gjson.NewWithOptions(result, gjson.Options{
+		StrNumber: true,
+	}).Scan(&res)
 	return
 }
 
@@ -222,7 +224,9 @@ func (*brandWpc) PreList(ctx context.Context, req BrandPreListReq) (res *BrandPr
 	result, err := post(ctx, method, g.Map{
 		"request": req,
 	})
-	_ = gjson.New(result).Scan(&res)
+	_ = gjson.NewWithOptions(result, gjson.Options{
+		StrNumber: true,
+	}).Scan(&res)
 	return
 }
 

upstream/wpc/wpc_goods.go

@@ -78,7 +78,9 @@ func (*goodsWpc) List(ctx context.Context, req GoodsListReq) (res *GoodsListRes,
 	result, err := post(ctx, method, g.Map{
 		"request": req,
 	})
-	_ = gjson.New(result).Scan(&res)
+	_ = gjson.NewWithOptions(result, gjson.Options{
+		StrNumber: true,
+	}).Scan(&res)
 	return
 }
 
@@ -114,7 +116,9 @@ func (*goodsWpc) Stock(ctx context.Context, req GoodsStockReq) (res *GoodsStockR
 	result, err := post(ctx, method, g.Map{
 		"request": req,
 	})
-	_ = gjson.New(result).Scan(&res)
+	_ = gjson.NewWithOptions(result, gjson.Options{
+		StrNumber: true,
+	}).Scan(&res)
 	return
 }
 
@@ -185,7 +189,9 @@ func (*goodsWpc) Detail(ctx context.Context, req GoodsDetailReq) (res *GoodsDeta
 	result, err := post(ctx, method, g.Map{
 		"request": req,
 	})
-	_ = gjson.New(result).Scan(&res)
+	_ = gjson.NewWithOptions(result, gjson.Options{
+		StrNumber: true,
+	}).Scan(&res)
 	return
 }
 
@@ -210,7 +216,9 @@ func (*goodsWpc) Status(ctx context.Context, req GoodsStatusReq) (res *GoodsStat
 	result, err := post(ctx, method, g.Map{
 		"request": req,
 	})
-	_ = gjson.New(result).Scan(&res)
+	_ = gjson.NewWithOptions(result, gjson.Options{
+		StrNumber: true,
+	}).Scan(&res)
 	return
 }
 
@@ -222,9 +230,19 @@ type GoodsSizeStatusReq struct {
 }
 
 type GoodsSizeStatusRes struct {
-	ReturnCode    string      `json:"returnCode"`
-	ReturnMessage string      `json:"returnMessage"`
-	Result        interface{} `json:"result"`
+	ReturnCode    string `json:"returnCode"`
+	ReturnMessage string `json:"returnMessage"`
+	Result        struct {
+		List []struct{
+			GoodFullId string
+			SizeId     string
+			SizeName     string
+			Stock     int
+			Type     string
+			GoodOnline int
+			BuyMaxNum int
+		}
+	}
 }
 
 //SizeStatus 批量查询尺码状态
@@ -235,7 +253,9 @@ func (*goodsWpc) SizeStatus(ctx context.Context, req GoodsSizeStatusReq) (res *G
 	result, err := post(ctx, method, g.Map{
 		"request": req,
 	})
-	_ = gjson.New(result).Scan(&res)
+	_ = gjson.NewWithOptions(result, gjson.Options{
+		StrNumber: true,
+	}).Scan(&res)
 	return
 }
 
@@ -249,7 +269,12 @@ type GoodsOnlineReq struct {
 type GoodsOnlineRes struct {
 	ReturnCode    string      `json:"returnCode"`
 	ReturnMessage string      `json:"returnMessage"`
-	Result        interface{} `json:"result"`
+	Result        struct{
+		GoodsList []struct{
+			GoodFullId string `json:"goodFullId"`
+			GoodOnline int `json:"goodOnline"`
+		}
+	} `json:"result"`
 }
 
 //Online 批量查询商品上下架
@@ -260,6 +285,8 @@ func (*goodsWpc) Online(ctx context.Context, req GoodsOnlineReq) (res *GoodsOnli
 	result, err := post(ctx, method, g.Map{
 		"request": req,
 	})
-	_ = gjson.New(result).Scan(&res)
+	_ = gjson.NewWithOptions(result, gjson.Options{
+		StrNumber: true,
+	}).Scan(&res)
 	return
 }

upstream/wpc/wpc_order.go

@@ -20,41 +20,6 @@ type OrderListReq struct {
 type OrderListRes struct {
 }
 
-//List 列表
-func (orderWpc) List(ctx context.Context, req OrderListReq) (res *OrderListRes, err error) {
-	method := "getSimpleOrderListV2"
-	req.ChannelId = server.AppKey
-	req.UserNumber = server.UserNumber
-	result, err := post(ctx, method, g.Map{
-		"request": req,
-	})
-	_ = gjson.New(result).Scan(&res)
-	return
-}
-
-type OrderDetailReq struct {
-	ChannelId  string `json:"vopChannelId"`
-	UserNumber string `json:"userNumber"`
-}
-
-type OrderDetailRes struct {
-	ReturnCode    string      `json:"returnCode"`
-	ReturnMessage string      `json:"returnMessage"`
-	Result        interface{} `json:"result"`
-}
-
-//Detail 详情
-func (orderWpc) Detail(ctx context.Context, req OrderDetailReq) (res *OrderDetailRes, err error) {
-	method := "getOrderDetail"
-	req.ChannelId = server.AppKey
-	req.UserNumber = server.UserNumber
-	result, err := post(ctx, method, g.Map{
-		"request": req,
-	})
-	_ = gjson.New(result).Scan(&res)
-	return
-}
-
 type OrderCreateReq struct {
 	ChannelId       string `json:"vopChannelId"`
 	UserNumber      string `json:"userNumber"`
@@ -71,7 +36,9 @@ type OrderCreateReq struct {
 	AddressCipher   string `json:"addressCipher,omitempty"`   //详细地址加密, 加密类型:RSA2048
 	ConsigneeCipher string `json:"consigneeCipher,omitempty"` //收件人加密, 加密类型:RSA2048
 	MobileCipher    string `json:"mobileCipher,omitempty"`    //收件人手机号加密, 加密类型:RSA2048
-	SizeInfo        string `json:"sizeInfo"`
+	SizeInfo        map[string]uint `json:"sizeInfo"`
+	ClientIp     	string `json:"clientIp"`
+	TraceId         string `json:"traceId"`
 }
 
 type OrderCreateSizeInfo struct {
@@ -100,15 +67,147 @@ type OrderCreateRes struct {
 		}
 	} `json:"result"`
 }
+type OrderDetailReq struct {
+	ChannelId  string `json:"vopChannelId"`
+	UserNumber string `json:"userNumber"`
+	Page       string `json:"page"`
+	PageSize   string `json:"pageSize"`
+	OrderSnList string `json:"orderSnList"`
+}
+type OrderPayReq struct {
+	ChannelId  string `json:"vopChannelId"`
+	UserNumber string `json:"userNumber"`
+	OrderSn string `json:"orderSn"`
+	ClientIp string `json:"clientIp"`
+}
+type OrderPayRes struct {
+	ReturnCode    string      `json:"returnCode"`
+	ReturnMessage string      `json:"returnMessage"`
+	Result        struct{
+		ApplySuccess bool `json:"applySuccess"`
+		FailReason string `json:"failReason"`
+	}
+}
+type OrderDetailRes struct {
+	ReturnCode    string      `json:"returnCode"`
+	ReturnMessage string      `json:"returnMessage"`
+	Result        []struct{
+		ParentOrderSn string
+		ChildOrderSnList []struct{
+			OrderSn string
+			StatusName string
+			TransportNo string
+			TransportName string
+			Goods []struct{
+				GoodFullId string
+				SizeId string
+				Price string
+			}
+			StatusCode int //订单状态Code--[1:"待支付"},{2:"待发货"},{3:"已发货"},{4:"已完成"},{5:"已取消"},{6:"拒收"},{7:"已签收"}]
+			RefundStatus int //退款状态, 0:未退款 1:已退款
+			ShippingFee string //订单运费
+			RealPayTotal string//订单实付金额
+			TransportList []struct{
+				TransportNo string
+				TransportName string
+				DetailList []struct{
+					GoodFullId string
+					SizeId string
+					Amount int
+				}
+			}
+		}
+	} `json:"result"`
+}
+type OrderGetSizeStatusReq struct {
+	AreaId       string `json:"areaId"`
+	SizeIds       string `json:"sizeIds"`
+	ChannelId       string `json:"vopChannelId"`
+	UserNumber      string `json:"userNumber"`
+}
+type OrderGetSizeStatusRes struct {
+	ReturnCode    string `json:"returnCode"`
+	ReturnMessage string `json:"returnMessage"`
+	Result        struct {
+		List []struct{
+			GoodFullId string
+			SizeId     string
+			SizeName     string
+			Stock     int
+			Type     string
+			GoodOnline int
+			BuyMaxNum int
+		}
+	}
+}
+//List 列表
+func (orderWpc) List(ctx context.Context, req OrderListReq) (res *OrderListRes, err error) {
+	method := "getSimpleOrderListV2"
+	req.ChannelId = server.AppKey
+	req.UserNumber = server.UserNumber
+	result, err := post(ctx, method, g.Map{
+		"request": req,
+	})
+	_ = gjson.NewWithOptions(result, gjson.Options{
+		StrNumber: true,
+	}).Scan(&res)
+	return
+}
+
+
+
+//订单信息
+func (orderWpc) Detail(ctx context.Context, req OrderDetailReq) (res *OrderDetailRes, err error) {
+	method := "getOrderInfoList"
+	req.ChannelId = server.AppKey
+	req.UserNumber = server.UserNumber
+	result, err := post(ctx, method, g.Map{
+		"request": req,
+	})
+	_ = gjson.NewWithOptions(result, gjson.Options{
+		StrNumber: true,
+	}).Scan(&res)
+	return
+}
+
 
 //Create 下单
 func (orderWpc) Create(ctx context.Context, req OrderCreateReq) (res *OrderCreateRes, err error) {
-	method := "orderCreate2Pms"
+	method := "orderCreate"
 	req.ChannelId = server.AppKey
 	req.UserNumber = server.UserNumber
 	result, err := post(ctx, method, g.Map{
 		"request": req,
 	})
-	_ = gjson.New(result).Scan(&res)
+	_ = gjson.NewWithOptions(result, gjson.Options{
+		StrNumber: true,
+	}).Scan(&res)
 	return
 }
+
+///获取规格状态
+func (orderWpc) GetAddr(ctx context.Context, req OrderGetSizeStatusReq) (res *OrderGetSizeStatusRes, err error) {
+	method := "selectAddress"
+	req.ChannelId = server.AppKey
+	req.UserNumber = server.UserNumber
+	result, err := post(ctx, method, g.Map{
+		"request": req,
+	})
+	_ = gjson.NewWithOptions(result, gjson.Options{
+		StrNumber: true,
+	}).Scan(&res)
+	return
+}
+///代扣
+func (orderWpc) ApplyPayment(ctx context.Context, req *OrderPayReq) (res *OrderPayRes, err error) {
+	method := "applyPayment"
+	req.ChannelId = server.AppKey
+	req.UserNumber = server.UserNumber
+	result, err := post(ctx, method, g.Map{
+		"request": req,
+	})
+	_ = gjson.NewWithOptions(result, gjson.Options{
+		StrNumber: true,
+	}).Scan(&res)
+	return
+}
\ No newline at end of file