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

weipinshang/goods_api_test.go

@@ -19,7 +19,7 @@ func setupMockServer(path string, method string, response string, t *testing.T)
 }
 
 func newClientWithServer(ts *httptest.Server) *wps.WeiPinShangClient {
-	return wps.NewWeiPinShangClient(wps.Config{
+	return wps.NewWeiPinShangClient(wps.WpsConfig{
 		BaseURL:     wps.DevHost,
 		ChannelType: "AILEHUI",
 		Key:         "f654ea5bde7635c3f46191191e5c4c8e",

weipinshang/model.go

@@ -112,10 +112,10 @@ type GetGoodsdeptRes struct {
 }
 
 type Goodsdept struct {
-	PageIndex string  `json:"pageIndex"`
-	PageCount int     `json:"pageCount"`
-	DataCount int     `json:"dataCount"`
-	List      []Goods `json:"list"`
+	PageIndex interface{} `json:"pageIndex"`
+	PageCount int         `json:"pageCount"`
+	DataCount int         `json:"dataCount"`
+	List      []Goods     `json:"list"`
 }
 
 // GetDetailsGoodsReq 获取批量商品详情接口

weipinshang/wei_pin_shang_client.go

@@ -32,7 +32,7 @@ const (
 )
 
 // Config 客户端配置
-type Config struct {
+type WpsConfig struct {
 	ChannelType string
 	Key         string
 	BaseURL     string
@@ -48,7 +48,7 @@ type WeiPinShangClient struct {
 }
 
 // NewWeiPinShangClient 创建客户端
-func NewWeiPinShangClient(cfg Config) *WeiPinShangClient {
+func NewWeiPinShangClient(cfg WpsConfig) *WeiPinShangClient {
 	if cfg.ChannelType == "" {
 		cfg.ChannelType = "AILEHUI"
 	}

weipinshang_api/req.go

@@ -1,7 +1,7 @@
 package weipinshang_api
 
 type CreateAfsApplyReq struct {
-	McOrderNo           int    `json:"mcOrderNo"`           // 子订单号	是	int	下单时候返回子订单号	20190704124955600363
+	McOrderNo           string `json:"mcOrderNo"`           // 子订单号	是	int	下单时候返回子订单号	20190704124955600363
 	CustomerExpect      int    `json:"customerExpect"`      //  售后类型 	是	int	[退货(10)、仅退款(40)]	10
 	QuestionDesc        string `json:"questionDesc"`        // 原因描述	否	String	[产品问题描述，最多600字符]	看下面请求示例
 	QuestionPic         string `json:"questionPic"`         //问题描述图片	否	String	[问题描述图片.最多2000字符]		支持多张图片，用逗号分隔（英文逗号）
@@ -35,8 +35,8 @@ type PreOrderReq struct {
 }
 
 type GoodsInfo struct {
-	GoodSpecId string `json:"goodSpecId"` //商品ID	goodSpecId	是	String		商品ID(c_goods_id)
-	GoodsId    string `json:"goodsId"`    //商品父	goodsId	是	String		商品父ID(c_father_goods_id)
+	GoodSpecId string `json:"goodSpecId"` //SKU ID	goodSpecId	是	String		商品ID(c_goods_id)
+	GoodsId    string `json:"goodsId"`    //商品ID	goodsId	是	String		商品父ID(c_father_goods_id)
 	Num        string `json:"num"`        // 数量
 }
 
@@ -45,3 +45,16 @@ type CreateOrderReq struct {
 	OrderNo   string `json:"orderNo"`   //对接方业务单号	orderNo	是	String
 	NoticeUrl string `json:"noticeUrl"` //合作方通知地址	noticeUrl	否	String	规定值	如支持，订单更新实时通知。此参数可不用传，统一走异步回调
 }
+
+// test ------------------------------------------------
+
+type DeliverGoodsReq struct {
+	COrderItemNo  string `json:"c_order_item_no"` //c_order_item_no	子订单号	是	int	下单时候返回子订单号	20190704124955600363
+	CDeliveryName string `json:"c_delivery_name"` //  快递公司
+	CDeliveryNo   string `json:"c_delivery_no"`   //  快递单号
+}
+
+type UpdateServiceReq struct {
+	COrderItemNo string `json:"c_order_item_no"` //c_order_item_no	子订单号	是	int	下单时候返回子订单号	20190704124955600363
+	CType        string `json:"c_type"`          //c_type	快递名称	是	String	[处理类型 1 同意售后 2 拒绝 3 退款完成]
+}

weipinshang_api/res.go

@@ -36,8 +36,9 @@ type SkuData struct {
 	GoodSpecId string `json:"goodSpecId"` //商品ID(c_goods_id)
 	GoodsId    string `json:"goodsId"`    //商品ID(c_father_goods_id)
 	GoodName   string `json:"goodName"`   //商品名称
-	Num        string `json:"num"`        //数量
-	Price      string `json:"price"`      //单价
+	//Num        string `json:"num"`        //数量
+	Num   int    `json:"num"`   //数量
+	Price string `json:"price"` //单价
 }
 
 type GetOrderInfoRes struct {
@@ -46,8 +47,9 @@ type GetOrderInfoRes struct {
 	Data []Data `json:"data"` //  返回数据	data		array
 }
 type Data struct {
-	CThirdUserCode     string  `json:"c_third_user_code"`     // 用户编码
-	COrderNoThird      string  `json:"c_order_no_third"`      // 渠道订单号
+	CThirdUserCode string `json:"c_third_user_code"` // 用户编码
+	//COrderNoThird      string  `json:"c_order_no_third"`      // 渠道订单号
+	COrderNo           string  `json:"c_order_no"`            // 渠道订单号
 	COrderNoPayservice string  `json:"c_order_no_payservice"` //支付订单号
 	CSendStatus        string  `json:"c_send_status"`         //  订单状态 订单所处阶段【’’CHECKED订单被创建’’,’INSTOCK已备货’,’’SENDED已发货’’,’’RECEIVED已收货’’】
 	CIsPay             int     `json:"c_is_pay"`              // 支付状态(0-未支付，1-已支付)
@@ -67,6 +69,12 @@ type Data struct {
 }
 
 type GetOrderInfoByItemNORes struct {
+	Code int                   `json:"code"` // 0为成功，其它为失败
+	Msg  string                `json:"msg"`  // 请求接口消息
+	Data OrderInfoByItemNOData `json:"data"` //  返回数据	data		array
+
+}
+type OrderInfoByItemNOData struct {
 	OrderItemNo  string `json:"order_item_no"` //  子订单号
 	SendStatus   string `json:"send_status"`   //发货状态【’CHECKED订单被创建’,’INSTOCK已备货’,’SENDED已发货’,’RECEIVED已收货’】
 	DeliveryName string `json:"delivery_name"` //  快递公司
@@ -81,6 +89,8 @@ type GetOrderInfoByThirdNORes struct {
 	Data []OrderInfoData `json:"data"` //  返回数据	data		array
 }
 type OrderInfoData struct {
+	GoodsId      string `json:"goodsId"`       //商品ID	goodsId	是	String		商品父ID(c_father_goods_id)
+	GoodSpecId   string `json:"goodSpecId"`    //SKU ID	goodSpecId	是	String		商品ID(c_goods_id)
 	OrderItemNo  string `json:"order_item_no"` //  子订单号
 	SendStatus   string `json:"send_status"`   //发货状态【’CHECKED订单被创建’,’INSTOCK已备货’,’SENDED已发货’,’RECEIVED已收货’】
 	DeliveryName string `json:"delivery_name"` //  快递公司
@@ -88,8 +98,13 @@ type OrderInfoData struct {
 }
 
 type IsRefundRes struct {
-	Code       int     `json:"code"`       // 0为成功，其它为失败
-	Msg        string  `json:"msg"`        // 请求接口消息
+	Code int          `json:"code"` // 0为成功，其它为失败
+	Msg  string       `json:"msg"`  // 请求接口消息
+	Data IsRefundData `json:"data"` //  返回数据	data		array
+
+}
+
+type IsRefundData struct {
 	ResultType []Param `json:"resultType"` // 售后类型
 	WareReturn []Param `json:"wareReturn"` //  服务类型
 }
@@ -109,3 +124,10 @@ type OrderCancelRes struct {
 	Code int    `json:"code"` // 0为成功，其它为失败
 	Msg  string `json:"msg"`  // 请求接口消息
 }
+
+// test -------------------------------------
+
+type TestRes struct {
+	Code int    `json:"code"` // 0为成功，其它为失败
+	Msg  string `json:"msg"`  // 请求接口消息
+}

weipinshang_api/wei_pin_shang_client.go

@@ -25,6 +25,8 @@ func NewWeiPinShangClient(host, channelType, key string) *WeiPinShangClient {
 	}
 }
 
+// pay
+
 func (w *WeiPinShangClient) GetManyPostage(getManyPostageReq *GetManyPostageReq) (res *GetManyPostageRes, err error) {
 	fmt.Println("getManyPostageReq", getManyPostageReq)
 	paramMap := make(map[string]any)
@@ -97,6 +99,8 @@ func (w *WeiPinShangClient) CreateOrder(createOrderReq *CreateOrderReq) (res *Cr
 	return
 }
 
+// GetOrderInfo 1
+
 func (w *WeiPinShangClient) GetOrderInfo(orderNo string) (res *GetOrderInfoRes, err error) {
 	fmt.Println("orderNo", orderNo)
 	paramMap := make(map[string]any)
@@ -115,6 +119,28 @@ func (w *WeiPinShangClient) GetOrderInfo(orderNo string) (res *GetOrderInfoRes,
 	return
 }
 
+// GetOrderInfo n
+
+func (w *WeiPinShangClient) GetOrderInfoByThirdNO(orderNo string) (res *GetOrderInfoByThirdNORes, err error) {
+	fmt.Println("orderNo", orderNo)
+	paramMap := make(map[string]any)
+	paramMap["orderNo"] = orderNo
+	postRes, err := w.WPSPost("mcang/Order/getOrderInfoByThirdNO", paramMap)
+	if err != nil {
+		return
+	}
+
+	err = json.Unmarshal(postRes, &res)
+	if err != nil || res == nil {
+		err = fmt.Errorf("转换GetOrderInfoByThirdNORes结构体失败: %s", string(postRes))
+		return
+	}
+
+	return
+}
+
+// refund
+
 func (w *WeiPinShangClient) GetOrderInfoByItemNO(mcOrderNo string) (res *GetOrderInfoByItemNORes, err error) {
 	fmt.Println("mcOrderNo", mcOrderNo)
 	//paramMap := make(map[string]any)
@@ -136,24 +162,6 @@ func (w *WeiPinShangClient) GetOrderInfoByItemNO(mcOrderNo string) (res *GetOrde
 	return
 }
 
-func (w *WeiPinShangClient) GetOrderInfoByThirdNO(orderNo string) (res *GetOrderInfoByThirdNORes, err error) {
-	fmt.Println("orderNo", orderNo)
-	paramMap := make(map[string]any)
-	paramMap["orderNo"] = orderNo
-	postRes, err := w.WPSPost("mcang/Order/getOrderInfoByThirdNO", paramMap)
-	if err != nil {
-		return
-	}
-
-	err = json.Unmarshal(postRes, &res)
-	if err != nil || res == nil {
-		err = fmt.Errorf("转换GetOrderInfoByThirdNORes结构体失败: %s", string(postRes))
-		return
-	}
-
-	return
-}
-
 func (w *WeiPinShangClient) IsRefund(mcOrderNo string) (res *IsRefundRes, err error) {
 	fmt.Println("mcOrderNo", mcOrderNo)
 	paramMap := make(map[string]any)
@@ -275,3 +283,42 @@ func (w *WeiPinShangClient) WPSPost(url string, paramMap map[string]any) (res []
 
 	return
 }
+
+// Test ----------------------------------------------------------------------------------------------
+
+func (w *WeiPinShangClient) DeliverGoods(deliverGoodsReq *DeliverGoodsReq) (res *TestRes, err error) {
+	fmt.Println("deliverGoodsReq", deliverGoodsReq)
+	paramMap := make(map[string]any)
+	paramMap["c_order_item_no"] = deliverGoodsReq.COrderItemNo
+	paramMap["c_delivery_name"] = deliverGoodsReq.CDeliveryName
+	paramMap["c_delivery_no"] = deliverGoodsReq.CDeliveryNo
+	postRes, err := w.WPSPost("mcang/Cycle/deliverGoods", paramMap)
+	if err != nil {
+		return
+	}
+
+	err = json.Unmarshal(postRes, &res)
+	if err != nil || res == nil {
+		err = fmt.Errorf("转换TestRes结构体失败: %s", string(postRes))
+		return
+	}
+	return
+}
+
+func (w *WeiPinShangClient) UpdateService(updateServiceReq *UpdateServiceReq) (res *TestRes, err error) {
+	fmt.Println("updateServiceReq", updateServiceReq)
+	paramMap := make(map[string]any)
+	paramMap["c_order_item_no"] = updateServiceReq.COrderItemNo
+	paramMap["c_type"] = updateServiceReq.CType
+	postRes, err := w.WPSPost("mcang/Cycle/updateService", paramMap)
+	if err != nil {
+		return
+	}
+
+	err = json.Unmarshal(postRes, &res)
+	if err != nil || res == nil {
+		err = fmt.Errorf("转换TestRes结构体失败: %s", string(postRes))
+		return
+	}
+	return
+}

weipinshang_api/wei_pin_shang_client_test.go

@@ -80,14 +80,14 @@ func TestWeiPinShangClient_PreOrder(t *testing.T) {
 				Key:         "f654ea5bde7635c3f46191191e5c4c8e",
 			},
 			args: PreOrderReq{
-				GoodsInfo:         "[{\"goodsId\":\"WPS9_282520\",\"goodSpecId\":\"WPS9_1221183858889276\",\"num\":1}]",
+				GoodsInfo:         "[{\"goodsId\":\"WPS9_282520\",\"goodSpecId\":\"WPS9_1221183858889276\",\"num\":2},{\"goodsId\":\"WPS2_0213160707208717\",\"goodSpecId\":\"WPS2_0213160707965791\",\"num\":2}]",
 				Province:          "广东省",
 				Address:           "奥园",
 				City:              "广州市",
 				Area:              "番禺区",
 				ConsigneePhone:    "15375390426",
 				ConsigneeContacts: "张三",
-				LockCode:          "L1234567890",
+				LockCode:          "L0123456789",
 				Source:            "AILEHUI",
 			},
 		},
@@ -135,8 +135,8 @@ func TestWeiPinShangClient_CreateOrder(t *testing.T) {
 				Key:         "f654ea5bde7635c3f46191191e5c4c8e",
 			},
 			args: CreateOrderReq{
-				LockCode: "L1234567890",
-				OrderNo:  "10000000000",
+				LockCode: "L0123456789",
+				OrderNo:  "20000000000",
 			},
 		},
 	}
@@ -159,6 +159,55 @@ func TestWeiPinShangClient_CreateOrder(t *testing.T) {
 	}
 }
 
+func TestWeiPinShangClient_GetOrderInfo(t *testing.T) {
+	type fields struct {
+		Host        string
+		ChannelType string
+		Key         string
+	}
+	type args struct {
+		orderNo string
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		wantRes *GetOrderInfoRes
+		wantErr bool
+	}{
+		{
+			name: "test1",
+			fields: fields{
+				Host:        "https://uat.api.weipinshang.net/",
+				ChannelType: "AILEHUI",
+				Key:         "f654ea5bde7635c3f46191191e5c4c8e",
+			},
+			args: args{
+				//orderNo: "20250527172503439229",
+				//orderNo: "10000000000",
+				orderNo: "20000000000",
+			},
+		},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			h := &WeiPinShangClient{
+				Host:        test.fields.Host,
+				ChannelType: test.fields.ChannelType,
+				Key:         test.fields.Key,
+			}
+
+			gotRes, err := h.GetOrderInfo(test.args.orderNo)
+
+			log.Println(gotRes, err)
+
+			if (err != nil) != test.wantErr {
+				t.Errorf("GetManyPostage() error = %v, wantErr %v", err, test.wantErr)
+			}
+		})
+	}
+}
+
 func TestWeiPinShangClient_GetOrderInfoByItemNO(t *testing.T) {
 	type fields struct {
 		Host        string
@@ -183,7 +232,8 @@ func TestWeiPinShangClient_GetOrderInfoByItemNO(t *testing.T) {
 				Key:         "f654ea5bde7635c3f46191191e5c4c8e",
 			},
 			args: args{
-				mcOrderNo: "mc20250527174640537475",
+				//mcOrderNo: "mc20250527174640537475",
+				mcOrderNo: "mc20250529102347907570",
 			},
 		},
 	}
@@ -230,7 +280,19 @@ func TestWeiPinShangClient_GetOrderInfoByThirdNO(t *testing.T) {
 				Key:         "f654ea5bde7635c3f46191191e5c4c8e",
 			},
 			args: args{
-				orderNo: "10000000000",
+				//orderNo: "10000000000",
+				orderNo: "20000000000",
+			},
+		},
+		{
+			name: "test1",
+			fields: fields{
+				Host:        "https://uat.api.weipinshang.net/",
+				ChannelType: "AILEHUI",
+				Key:         "f654ea5bde7635c3f46191191e5c4c8e",
+			},
+			args: args{
+				orderNo: "20250527172503439229",
 			},
 		},
 	}
@@ -252,3 +314,171 @@ func TestWeiPinShangClient_GetOrderInfoByThirdNO(t *testing.T) {
 		})
 	}
 }
+
+func TestWeiPinShangClient_IsRefund(t *testing.T) {
+	type fields struct {
+		Host        string
+		ChannelType string
+		Key         string
+	}
+	type args struct {
+		mcOrderNo string
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		wantRes *IsRefundRes
+		wantErr bool
+	}{
+		{
+			name: "test1",
+			fields: fields{
+				Host:        "https://uat.api.weipinshang.net/",
+				ChannelType: "AILEHUI",
+				Key:         "f654ea5bde7635c3f46191191e5c4c8e",
+			},
+			args: args{
+				mcOrderNo: "mc20250529102347907570",
+			},
+		},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			h := &WeiPinShangClient{
+				Host:        test.fields.Host,
+				ChannelType: test.fields.ChannelType,
+				Key:         test.fields.Key,
+			}
+
+			gotRes, err := h.IsRefund(test.args.mcOrderNo)
+
+			log.Println(gotRes, err)
+
+			if (err != nil) != test.wantErr {
+				t.Errorf("GetManyPostage() error = %v, wantErr %v", err, test.wantErr)
+			}
+		})
+	}
+}
+
+// test ---------------------------------------------------
+
+func TestWeiPinShangClient_DeliverGoods(t *testing.T) {
+	type fields struct {
+		Host        string
+		ChannelType string
+		Key         string
+	}
+
+	tests := []struct {
+		name    string
+		fields  fields
+		args    DeliverGoodsReq
+		wantRes *TestRes
+		wantErr bool
+	}{
+		{
+			name: "test1",
+			fields: fields{
+				Host:        "https://uat.api.weipinshang.net/",
+				ChannelType: "AILEHUI",
+				Key:         "f654ea5bde7635c3f46191191e5c4c8e",
+			},
+			args: DeliverGoodsReq{
+				COrderItemNo:  "mc20250527172503957733",
+				CDeliveryName: "顺丰",
+				CDeliveryNo:   "1234567890",
+			},
+		},
+
+		{
+			name: "test1",
+			fields: fields{
+				Host:        "https://uat.api.weipinshang.net/",
+				ChannelType: "AILEHUI",
+				Key:         "f654ea5bde7635c3f46191191e5c4c8e",
+			},
+			args: DeliverGoodsReq{
+				COrderItemNo:  "mc20250527172503673418",
+				CDeliveryName: "京东",
+				CDeliveryNo:   "1234567890",
+			},
+		},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			h := &WeiPinShangClient{
+				Host:        test.fields.Host,
+				ChannelType: test.fields.ChannelType,
+				Key:         test.fields.Key,
+			}
+
+			gotRes, err := h.DeliverGoods(&test.args)
+
+			log.Println(gotRes, err)
+
+			if (err != nil) != test.wantErr {
+				t.Errorf("GetManyPostage() error = %v, wantErr %v", err, test.wantErr)
+			}
+		})
+	}
+}
+func TestWeiPinShangClient_UpdateService(t *testing.T) {
+	type fields struct {
+		Host        string
+		ChannelType string
+		Key         string
+	}
+
+	tests := []struct {
+		name    string
+		fields  fields
+		args    UpdateServiceReq
+		wantRes *TestRes
+		wantErr bool
+	}{
+		{
+			name: "test1",
+			fields: fields{
+				Host:        "https://uat.api.weipinshang.net/",
+				ChannelType: "AILEHUI",
+				Key:         "f654ea5bde7635c3f46191191e5c4c8e",
+			},
+			args: UpdateServiceReq{
+				COrderItemNo: "20250527172503439229",
+				CType:        "1",
+			},
+		},
+
+		{
+			name: "test1",
+			fields: fields{
+				Host:        "https://uat.api.weipinshang.net/",
+				ChannelType: "AILEHUI",
+				Key:         "f654ea5bde7635c3f46191191e5c4c8e",
+			},
+			args: UpdateServiceReq{
+				COrderItemNo: "10000000000",
+				CType:        "2",
+			},
+		},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			h := &WeiPinShangClient{
+				Host:        test.fields.Host,
+				ChannelType: test.fields.ChannelType,
+				Key:         test.fields.Key,
+			}
+
+			gotRes, err := h.UpdateService(&test.args)
+
+			log.Println(gotRes, err)
+
+			if (err != nil) != test.wantErr {
+				t.Errorf("GetManyPostage() error = %v, wantErr %v", err, test.wantErr)
+			}
+		})
+	}
+}