Merge branch 'feature/对接新供应链-唯品尚'

This commit is contained in:
yuguojian 2025-06-18 16:15:02 +08:00
commit 3d62321146
3 changed files with 14 additions and 10 deletions

View File

@ -36,8 +36,8 @@ type SkuData struct {
GoodSpecId string `json:"goodSpecId"` //商品ID(c_goods_id) GoodSpecId string `json:"goodSpecId"` //商品ID(c_goods_id)
GoodsId string `json:"goodsId"` //商品ID(c_father_goods_id) GoodsId string `json:"goodsId"` //商品ID(c_father_goods_id)
GoodName string `json:"goodName"` //商品名称 GoodName string `json:"goodName"` //商品名称
//Num string `json:"num"` //数量 Num string `json:"num"` //数量
Num int `json:"num"` //数量 //Num int `json:"num"` //数量
Price string `json:"price"` //单价 Price string `json:"price"` //单价
} }

View File

@ -8,6 +8,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"log"
"net/http" "net/http"
"strings" "strings"
) )
@ -268,6 +269,7 @@ func (w *WeiPinShangClient) WPSPost(url string, paramMap map[string]any) (res []
if err != nil { if err != nil {
return return
} }
//req.Proto = "HTTP/2"
req.Header.Set("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
req.Header.Set("channelType", w.ChannelType) req.Header.Set("channelType", w.ChannelType)
@ -276,13 +278,15 @@ func (w *WeiPinShangClient) WPSPost(url string, paramMap map[string]any) (res []
return return
} }
req.Header.Set("md5", sign) req.Header.Set("md5", sign)
//log.Printf("WPSPost req: %+v\n", req)
// 创建 HTTP 客户端 // 创建 HTTP 客户端
client := &http.Client{} client := &http.Client{}
//log.Printf("WPSPost client: %+v\n", client)
// 发送请求 // 发送请求
resp, err := client.Do(req) resp, err := client.Do(req)
log.Printf("WPSPost resp: %+v\n", resp)
if err != nil { if err != nil {
log.Printf("发送请求失败: %+v\n", err)
return return
} }
defer func(Body io.ReadCloser) { defer func(Body io.ReadCloser) {
@ -295,7 +299,7 @@ func (w *WeiPinShangClient) WPSPost(url string, paramMap map[string]any) (res []
return return
} }
fmt.Printf("res: %s\n", string(res)) //fmt.Printf("res: %s\n", string(res))
if !json.Valid(res) { if !json.Valid(res) {
return nil, errors.New("响应体不是有效的JSON格式") return nil, errors.New("响应体不是有效的JSON格式")

View File

@ -80,14 +80,14 @@ func TestWeiPinShangClient_PreOrder(t *testing.T) {
Key: "f654ea5bde7635c3f46191191e5c4c8e", Key: "f654ea5bde7635c3f46191191e5c4c8e",
}, },
args: PreOrderReq{ args: PreOrderReq{
GoodsInfo: "[{\"goodsId\":\"WPS9_282520\",\"goodSpecId\":\"WPS9_1221183858889276\",\"num\":2}]", GoodsInfo: "[{\"goodsId\":\"WPS2_1231155626421463\",\"goodSpecId\":\"WPS2_12311556265677476\",\"num\":1}]",
Province: "广东省", Province: "广东省",
Address: "奥园", Address: "奥园",
City: "广州市", City: "广州市",
Area: "番禺区", Area: "番禺区",
ConsigneePhone: "15375390426", ConsigneePhone: "15375390426",
ConsigneeContacts: "张三", ConsigneeContacts: "张三",
LockCode: "L100000000", LockCode: "L100000002",
Source: "AILEHUI", Source: "AILEHUI",
}, },
}, },
@ -135,8 +135,8 @@ func TestWeiPinShangClient_CreateOrder(t *testing.T) {
Key: "f654ea5bde7635c3f46191191e5c4c8e", Key: "f654ea5bde7635c3f46191191e5c4c8e",
}, },
args: CreateOrderReq{ args: CreateOrderReq{
LockCode: "L100000000", LockCode: "L100000002",
OrderNo: "30000000000", OrderNo: "2000000001",
}, },
}, },
} }
@ -292,7 +292,7 @@ func TestWeiPinShangClient_GetOrderInfoByThirdNO(t *testing.T) {
Key: "f654ea5bde7635c3f46191191e5c4c8e", Key: "f654ea5bde7635c3f46191191e5c4c8e",
}, },
args: args{ args: args{
orderNo: "570872619444771455", orderNo: "570853643339733632",
}, },
}, },
} }