From ce47cf1e89e0d9a892049683acc2bc9a7f42377a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 25 Aug 2023 18:31:33 +0800 Subject: [PATCH] 1 --- platformapi/ebaiapi/order.go | 21 ++++++++++++-- platformapi/ebaiapi/order_test.go | 44 ++++++++++++++++++++--------- platformapi/mtwmapi/mtwmapi_test.go | 4 +-- platformapi/mtwmapi/order_test.go | 2 +- 4 files changed, 51 insertions(+), 20 deletions(-) diff --git a/platformapi/ebaiapi/order.go b/platformapi/ebaiapi/order.go index 615f6bd2..408526e2 100644 --- a/platformapi/ebaiapi/order.go +++ b/platformapi/ebaiapi/order.go @@ -2,6 +2,7 @@ package ebaiapi import ( "fmt" + "git.rosy.net.cn/jx-callback/globals" "time" "git.rosy.net.cn/baseapi/utils" @@ -659,10 +660,24 @@ func (a *API) EbaiRefundOrder(param *RefundOrderExamine) error { param.ReasonCode = "7001" } - _, err := a.AccessAPI("order.reverse.process", utils.Struct2MapByJson(param)) + globals.SugarLogger.Debugf("param := %s", utils.Format4Output(param, false)) + data, err := a.AccessAPI("order.reverse.process", utils.Struct2MapByJson(param)) + globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false)) return err } +// GetReverseOrder 根据订单号获取详细订单详情 +func (a *API) GetReverseOrder(orderId string) ([]interface{}, error) { + refundOrder, err := a.AccessAPI("order.reverse.query", map[string]interface{}{ + "order_id": orderId, + }) + if err != nil { + return nil, err + } + + return refundOrder.Data.(map[string]interface{})["reverse_order_list"].([]interface{})[0].(map[string]interface{})["sub_reverse_order_list"].([]interface{}), nil +} + // RefundOrderExamine 商家审核是售后单 type RefundOrderExamine struct { ReverseOrderId string `json:"reverse_order_id" required:"true"` // 逆向单ID @@ -677,6 +692,6 @@ type RefundOrderExamine struct { type RefundProductList struct { SubBizOrderId string `json:"sub_biz_order_id" required:"false"` // 商品子单ID PlatformSkuId string `json:"platform_sku_id" required:"false"` // 平台商品ID - Number string `json:"number"` - RefundAmount string `json:"refund_amount"` + //Number string `json:"number"` + //RefundAmount string `json:"refund_amount"` } diff --git a/platformapi/ebaiapi/order_test.go b/platformapi/ebaiapi/order_test.go index 6f8a57d4..dbc8ac2c 100644 --- a/platformapi/ebaiapi/order_test.go +++ b/platformapi/ebaiapi/order_test.go @@ -1,16 +1,16 @@ package ebaiapi import ( + "encoding/json" "fmt" "git.rosy.net.cn/jx-callback/globals" "testing" + "time" "git.rosy.net.cn/baseapi/utils" ) func TestCancelOrder(t *testing.T) { - err := api.OrderDisagreeReturnGoods("4007560108986061407", "1939575364735607", "1") - fmt.Println(err) } func TestOrderGet(t *testing.T) { @@ -23,15 +23,37 @@ func TestOrderGet(t *testing.T) { } func TestOrderAgreePartRefund(t *testing.T) { - data := make([]*RefundSku, 0, 0) - data = append(data, &RefundSku{ - SkuID: "22891", - Number: "1", - }) - err := api.OrderAgreePartRefund("4045250124015619672", data, "2308258682813174525") + param := &RefundOrderExamine{ + ReverseOrderId: "2308258682813174525", + OrderId: "4045250124015619672", + IdempotentId: utils.Int64ToStr(time.Now().UnixNano()), + ActionType: RefundTypeAgree, + ReasonCode: "", + ReasonRemarks: "同意了", + RefundProductList: "", + } + refundProductList := make([]*RefundProductList, 0, 0) + date, _ := api.GetReverseOrder("4045250124015619672") + for _, v := range date { + refundProduct := &RefundProductList{ + SubBizOrderId: v.(map[string]interface{})["sub_biz_order_id"].(string), + PlatformSkuId: utils.Int64ToStr(utils.Interface2Int64WithDefault(v.(map[string]interface{})["platform_sku_id"], 0)), + } + + refundProductList = append(refundProductList, refundProduct) + } + refundProductListStr, _ := json.Marshal(refundProductList) + param.RefundProductList = string(refundProductListStr) + err := api.EbaiRefundOrder(param) globals.SugarLogger.Debugf("err := %s", utils.Format4Output(err, false)) } +func TestGetReverseOrder(t *testing.T) { + date, _ := api.GetReverseOrder("4099660048407490187") + for _, v := range date { + fmt.Println(v) + } +} func TestOrderGet2(t *testing.T) { result, err := api.OrderGet2("2147234624018417846") if err != nil { @@ -176,12 +198,6 @@ func TestAPI_OrderselfDeliveryStateSync(t *testing.T) { t.Fatal(err) } } -func TestAggrent(t *testing.T) { - err := api.OrderAgreeReturnGoods("4648176604190697145", "1483635799404794") - if err != nil { - t.Fatal(err) - } -} func TestForAA(t *testing.T) { diff --git a/platformapi/mtwmapi/mtwmapi_test.go b/platformapi/mtwmapi/mtwmapi_test.go index 9b9557ca..238a05d5 100644 --- a/platformapi/mtwmapi/mtwmapi_test.go +++ b/platformapi/mtwmapi/mtwmapi_test.go @@ -20,13 +20,13 @@ func init() { baseapi.Init(sugarLogger) // 菜市 - //api = New("589", "a81eb3df418d83d6a1a4b7c572156d2f", "", "") + api = New("589", "a81eb3df418d83d6a1a4b7c572156d2f", "", "") // 果园 //api = New("4123", "df2c88338b85f830cebce2a9eab56628", "", "") //商超 - api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_v-zI40EPjPfXLmaKdgRPqA") //token_n4TwqCntWWuvQwAawzxC0w + //api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_v-zI40EPjPfXLmaKdgRPqA") //token_n4TwqCntWWuvQwAawzxC0w cookieStr := ` acctId=57396785; token=0bWbK5VbK50E2BmIhIH2zHB-am_y7mB37yXHm6RLZWx4*; wmPoiId=-1; ` diff --git a/platformapi/mtwmapi/order_test.go b/platformapi/mtwmapi/order_test.go index 5f5d61d6..ec28898e 100644 --- a/platformapi/mtwmapi/order_test.go +++ b/platformapi/mtwmapi/order_test.go @@ -88,7 +88,7 @@ func TestOrderLogisticsStatus(t *testing.T) { } func TestOrderLogisticsFee(t *testing.T) { - result, err := api.OrderLogisticsFee(1000690713907180740) + result, err := api.OrderLogisticsFee(1100693360542144311) if err != nil { t.Fatal(err) }