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

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字符]		支持多张图片，用逗号分隔（英文逗号）
@@ -46,6 +46,14 @@ type CreateOrderReq struct {
 	NoticeUrl string `json:"noticeUrl"` //合作方通知地址	noticeUrl	否	String	规定值	如支持，订单更新实时通知。此参数可不用传，统一走异步回调
 }
 
+type RefundDeliveryReq struct {
+	McOrderNo    string `json:"mcOrderNo"`    // 子订单号	是	int	下单时候返回子订单号	20190704124955600363
+	DeliveryName string `json:"deliveryName"` //  快递公司
+	DeliveryNo   string `json:"deliveryNo"`   //  快递单号
+	Freight      string `json:"freight"`      // 运费金额	freight	否	string	单位：元
+	FreightImg   string `json:"freightImg"`   // 运费支付凭证	freightImg	否	string	图片地址
+}
+
 // test ------------------------------------------------
 
 type DeliverGoodsReq struct {

weipinshang_api/res.go

@@ -69,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"` //  快递公司
@@ -119,6 +125,11 @@ type OrderCancelRes struct {
 	Msg  string `json:"msg"`  // 请求接口消息
 }
 
+type RefundDeliveryRes struct {
+	Code int    `json:"code"` // 0为成功，其它为失败
+	Msg  string `json:"msg"`  // 请求接口消息
+}
+
 // test -------------------------------------
 
 type TestRes struct {

weipinshang_api/wei_pin_shang_client.go

@@ -143,11 +143,9 @@ func (w *WeiPinShangClient) GetOrderInfoByThirdNO(orderNo string) (res *GetOrder
 
 func (w *WeiPinShangClient) GetOrderInfoByItemNO(mcOrderNo string) (res *GetOrderInfoByItemNORes, err error) {
 	fmt.Println("mcOrderNo", mcOrderNo)
-	//paramMap := make(map[string]any)
+	paramMap := make(map[string]any)
-	//paramMap["mcOrderNo"] = mcOrderNo
+	paramMap["mcOrderNo"] = mcOrderNo
-	paramMap := map[string]any{
+
-		"mcOrderNo": mcOrderNo,
-	}
 	postRes, err := w.WPSPost("mcang/Order/getOrderInfoByItemNO", paramMap)
 	if err != nil {
 		return
@@ -197,7 +195,7 @@ func (w *WeiPinShangClient) CreateAfsApply(createAfsApplyReq *CreateAfsApplyReq)
 	paramMap["pickwareCounty"] = createAfsApplyReq.PickwareCounty
 	paramMap["pickwareAddress"] = createAfsApplyReq.PickwareAddress
 
-	postRes, err := w.WPSPost("mcang/Refunds/IsRefund", paramMap)
+	postRes, err := w.WPSPost("mcang/Refunds/createAfsApply", paramMap)
 	if err != nil {
 		return
 	}
@@ -214,7 +212,7 @@ func (w *WeiPinShangClient) OrderCancel(mcOrderNo string) (res *OrderCancelRes,
 	fmt.Println("mcOrderNo", mcOrderNo)
 	paramMap := make(map[string]any)
 	paramMap["mcOrderNo"] = mcOrderNo
-	postRes, err := w.WPSPost("mcang/Refunds/IsRefund", paramMap)
+	postRes, err := w.WPSPost("mcang/Refunds/orderCancel", paramMap)
 	if err != nil {
 		return
 	}
@@ -227,6 +225,27 @@ func (w *WeiPinShangClient) OrderCancel(mcOrderNo string) (res *OrderCancelRes,
 	return
 }
 
+func (w *WeiPinShangClient) RefundDelivery(refundDeliveryReq RefundDeliveryReq) (res *RefundDeliveryRes, err error) {
+	fmt.Println("refundDeliveryReq", refundDeliveryReq)
+	paramMap := make(map[string]any)
+	paramMap["mcOrderNo"] = refundDeliveryReq.McOrderNo
+	paramMap["deliveryName"] = refundDeliveryReq.DeliveryName
+	paramMap["deliveryNo"] = refundDeliveryReq.DeliveryNo
+	paramMap["freight"] = refundDeliveryReq.Freight
+	paramMap["freightImg"] = refundDeliveryReq.FreightImg
+	postRes, err := w.WPSPost("mcang/Refunds/refundDelivery", paramMap)
+	if err != nil {
+		return
+	}
+
+	err = json.Unmarshal(postRes, &res)
+	if err != nil || res == nil {
+		err = fmt.Errorf("转换RefundDeliveryRes结构体失败: %s", string(postRes))
+		return
+	}
+	return
+}
+
 func (w *WeiPinShangClient) Sign(paramMap map[string]any) (res string, err error) {
 	var sumParamString string
 	if len(paramMap) != 0 {

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\":2},{\"goodsId\":\"WPS2_0213160707208717\",\"goodSpecId\":\"WPS2_0213160707965791\",\"num\":2}]",
+				GoodsInfo:         "[{\"goodsId\":\"WPS9_282520\",\"goodSpecId\":\"WPS9_1221183858889276\",\"num\":2}]",
 				Province:          "广东省",
 				Address:           "奥园",
 				City:              "广州市",
 				Area:              "番禺区",
 				ConsigneePhone:    "15375390426",
 				ConsigneeContacts: "张三",
-				LockCode:          "L0123456789",
+				LockCode:          "L100000000",
 				Source:            "AILEHUI",
 			},
 		},
@@ -135,8 +135,8 @@ func TestWeiPinShangClient_CreateOrder(t *testing.T) {
 				Key:         "f654ea5bde7635c3f46191191e5c4c8e",
 			},
 			args: CreateOrderReq{
-				LockCode: "L0123456789",
+				LockCode: "L100000000",
-				OrderNo:  "20000000000",
+				OrderNo:  "30000000000",
 			},
 		},
 	}
@@ -233,7 +233,7 @@ func TestWeiPinShangClient_GetOrderInfoByItemNO(t *testing.T) {
 			},
 			args: args{
 				//mcOrderNo: "mc20250527174640537475",
-				mcOrderNo: "mc20250529102347907570",
+				mcOrderNo: "mc20250529102347485667",
 			},
 		},
 	}
@@ -362,6 +362,53 @@ func TestWeiPinShangClient_IsRefund(t *testing.T) {
 	}
 }
 
+func TestWeiPinShangClient_OrderCancel(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: "mc20250529102347485667",
+			},
+		},
+	}
+	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.OrderCancel(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) {
@@ -400,7 +447,7 @@ func TestWeiPinShangClient_DeliverGoods(t *testing.T) {
 				Key:         "f654ea5bde7635c3f46191191e5c4c8e",
 			},
 			args: DeliverGoodsReq{
-				COrderItemNo:  "mc20250527172503673418",
+				COrderItemNo:  "mc20250530115549372224",
 				CDeliveryName: "京东",
 				CDeliveryNo:   "1234567890",
 			},
@@ -459,8 +506,8 @@ func TestWeiPinShangClient_UpdateService(t *testing.T) {
 				Key:         "f654ea5bde7635c3f46191191e5c4c8e",
 			},
 			args: UpdateServiceReq{
-				COrderItemNo: "10000000000",
+				COrderItemNo: "mc20250530172009173148",
-				CType:        "2",
+				CType:        "3",
 			},
 		},
 	}