From edebc7ab41fcc02394d72cf610e466271f1ecf84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 9 Dec 2023 09:11:45 +0800 Subject: [PATCH] 1 --- platformapi/ebaiapi/order.go | 4 +++- platformapi/ebaiapi/shop.go | 3 ++- platformapi/ebaiapi/shop_test.go | 20 ++++++-------------- platformapi/limit_access_speed_test.go | 5 +++++ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/platformapi/ebaiapi/order.go b/platformapi/ebaiapi/order.go index b0bb8b58..2d765217 100644 --- a/platformapi/ebaiapi/order.go +++ b/platformapi/ebaiapi/order.go @@ -660,7 +660,9 @@ func (a *API) EbaiRefundOrder(param *RefundOrderExamine) error { if (param.ActionType == RefundTypeRefuse || param.ActionType == RefundTypeRefuseGoods) && param.ReasonCode == "" { param.ReasonCode = "7001" } - + if param.ReasonRemarks != "" { + param.ActionType = 2 + } _, err := a.AccessAPI("order.reverse.process", utils.Struct2MapByJson(param)) return err } diff --git a/platformapi/ebaiapi/shop.go b/platformapi/ebaiapi/shop.go index 64c6c031..0d983a5b 100644 --- a/platformapi/ebaiapi/shop.go +++ b/platformapi/ebaiapi/shop.go @@ -224,8 +224,9 @@ func (a *API) ShopGet2(shopID string, baiduShopID int64) (shopDetail *ShopDetail func (a *API) ShopUpdate(params map[string]interface{}) (err error) { globals.SugarLogger.Debugf("================param := %s", utils.Format4Output(params, false)) - _, err = a.AccessAPI("shop.update", params) + data, err := a.AccessAPI("shop.update", params) globals.SugarLogger.Debugf("================err := %v", err) + globals.SugarLogger.Debugf("================err := %s", utils.Format4Output(data, false)) if err == nil { return nil } diff --git a/platformapi/ebaiapi/shop_test.go b/platformapi/ebaiapi/shop_test.go index 5f4529f3..c8eb253e 100644 --- a/platformapi/ebaiapi/shop_test.go +++ b/platformapi/ebaiapi/shop_test.go @@ -80,20 +80,12 @@ func TestShopAptitudeGet(t *testing.T) { func TestShopUpdate(t *testing.T) { params := map[string]interface{}{ - //KeyName: "好菜鲜生(龙宫市场店)", - //KeyPhone: "13812345678", - KeyBaiduShopID: "2097134681", - //"longitude": 116.307884, - //"latitude": 40.036828, - //"coord_type": "amap", - //"province": "131", - //"city": "131", - //"county": "1960", - //"address": "北京市海淀区上地信息路甲9号", - //"takeout_shop_logo": "https://image-star.elemecdn.com/pb/b79d499b9b0be5deb3ee3ce71bf29ad0a8", - //"baidu_takeout_logo": "https://image-star.elemecdn.com/pb/b79d499b9b0be5deb3ee3ce71bf29ad0a8", - //"ele_takeout_logo": "https://image-star.elemecdn.com/pb/b79d499b9b0be5deb3ee3ce71bf29ad0a8", - //"baidu_takeout_logo" //takeoutShopLogo//baiduTakeoutLogo + "address": "四川省成都市双流区东升街道藏卫路中段21号D区23号", + "baidu_shop_id": "511574437", + "business_time": []map[string]string{{"end": "19:30", "start": "07:30"}}, + "ivr_phone": "17366937206", + "package_box_price": 100, + "service_phone": "13310841099", } err := api.ShopUpdate(params) if err != nil { diff --git a/platformapi/limit_access_speed_test.go b/platformapi/limit_access_speed_test.go index 800ea310..59460121 100644 --- a/platformapi/limit_access_speed_test.go +++ b/platformapi/limit_access_speed_test.go @@ -9,6 +9,11 @@ import ( "git.rosy.net.cn/baseapi/utils" ) +func TestName(t *testing.T) { + fmt.Println(1 | 2) + fmt.Println(1 | 6) + +} func TestLimitSpeed(t *testing.T) { limiter := New(map[string]*LimiterConfig{ "limited1persecond": &LimiterConfig{