From 674d8d067db5e40aef6343d6a5c6c12d9e8d8791 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 8 Jan 2024 09:50:51 +0800 Subject: [PATCH 1/5] 1 --- platformapi/sfps2/callback.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformapi/sfps2/callback.go b/platformapi/sfps2/callback.go index f7bc65b9..9617a96a 100644 --- a/platformapi/sfps2/callback.go +++ b/platformapi/sfps2/callback.go @@ -146,7 +146,7 @@ func (a *API) GetCallbackUrlIndex(request *http.Request) (map[string]interface{} if err = json.Unmarshal(data, &temp); err == nil { urlIndex = temp["url_index"].(string) } - + globals.SugarLogger.Debugf("sfsfsf test data=%s,urlIndex=%s", utils.Format4Output(data, false), urlIndex) result := make(map[string]interface{}, 0) switch urlIndex { case UrlIndexRiderStatus: From 73ce219a6f6119f2267641f0aac6b682006d8ed4 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 8 Jan 2024 13:55:52 +0800 Subject: [PATCH 2/5] 1 --- platformapi/sfps2/callback.go | 2 +- platformapi/sfps2/sf_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platformapi/sfps2/callback.go b/platformapi/sfps2/callback.go index 9617a96a..70ec9230 100644 --- a/platformapi/sfps2/callback.go +++ b/platformapi/sfps2/callback.go @@ -146,7 +146,7 @@ func (a *API) GetCallbackUrlIndex(request *http.Request) (map[string]interface{} if err = json.Unmarshal(data, &temp); err == nil { urlIndex = temp["url_index"].(string) } - globals.SugarLogger.Debugf("sfsfsf test data=%s,urlIndex=%s", utils.Format4Output(data, false), urlIndex) + globals.SugarLogger.Debugf("sfsfsf test data=%s,urlIndex=%s", utils.Format4Output(temp, false), urlIndex) result := make(map[string]interface{}, 0) switch urlIndex { case UrlIndexRiderStatus: diff --git a/platformapi/sfps2/sf_test.go b/platformapi/sfps2/sf_test.go index 0389259a..c2b51900 100644 --- a/platformapi/sfps2/sf_test.go +++ b/platformapi/sfps2/sf_test.go @@ -65,7 +65,7 @@ func TestCreateOrder(t *testing.T) { DevId: AppID, ShopId: TestSFStoreID, ShopType: 1, - ShopOrderId: "2023090806", + ShopOrderId: "20240108", OrderSequence: "测试", OrderSource: OrderSourceELM, OrderTime: 1694168441, From 09354ef01652da3465427049a3536f31cab19ba4 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 8 Jan 2024 15:43:26 +0800 Subject: [PATCH 3/5] 1 --- platformapi/sfps2/order.go | 6 ++++++ platformapi/sfps2/sf_model.go | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/platformapi/sfps2/order.go b/platformapi/sfps2/order.go index e0d6aacd..c2a2fd6f 100644 --- a/platformapi/sfps2/order.go +++ b/platformapi/sfps2/order.go @@ -13,6 +13,9 @@ func (a *API) PreCreateOrder(preOrder *PreCreateOrderReq) (price float64, err er //补全默认参数 preOrder.PushTime = time.Now().Unix() preOrder.DevId = a.devId + + preOrder.ShopId = SFShopTestOpenStoreID //todo 测试用 删除 + resp := a.HttpPostJson("precreateorder", preOrder) if resp.HttpStatusCode != HttpStatusSuccessCode { return 0, errors.New("HTTP请求错误，请检查重试") @@ -38,6 +41,9 @@ func (a *API) CreateOrder(order *CreateOrderReq) (sfOrderID, sfBillID string, to order.PushTime = time.Now().Unix() order.Version = DefaultVersion order.DevId = a.devId + + order.ShopId = SFShopTestOpenStoreID //todo 测试用 删除 + resp := a.HttpPostJson("createorder", order) if resp.HttpStatusCode != HttpStatusSuccessCode { return "", "", 0, 0, errors.New("HTTP请求错误，请检查重试") diff --git a/platformapi/sfps2/sf_model.go b/platformapi/sfps2/sf_model.go index 5d0fbf58..5ab67131 100644 --- a/platformapi/sfps2/sf_model.go +++ b/platformapi/sfps2/sf_model.go @@ -15,9 +15,9 @@ const ( SuccessMsg = "success" //成功 msg FailCode = -1 FailMsg = "fail" - //SFShopStoreID = "3263670062849" //测试店铺ID - SFShopStoreID = "3270357468929" //正式店铺ID - DefaultVersion = 19 //参照文档主版本号填写 如：文档版本号1.9,version=19，推荐使用版本19 + SFShopTestOpenStoreID = "3263670062849" //测试店铺ID + SFShopStoreID = "3270357468929" //正式店铺ID + DefaultVersion = 19 //参照文档主版本号填写 如：文档版本号1.9,version=19，推荐使用版本19 ) // SFCityStoreIDs 各城市正式店铺id From cbd7643dbe1a1f2145dd5ea3c061d0a0089dbab2 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 8 Jan 2024 17:11:44 +0800 Subject: [PATCH 4/5] 1 --- platformapi/sfps2/order.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platformapi/sfps2/order.go b/platformapi/sfps2/order.go index c2a2fd6f..b77354cb 100644 --- a/platformapi/sfps2/order.go +++ b/platformapi/sfps2/order.go @@ -14,7 +14,7 @@ func (a *API) PreCreateOrder(preOrder *PreCreateOrderReq) (price float64, err er preOrder.PushTime = time.Now().Unix() preOrder.DevId = a.devId - preOrder.ShopId = SFShopTestOpenStoreID //todo 测试用 删除 + //preOrder.ShopId = SFShopTestOpenStoreID // 测试用 resp := a.HttpPostJson("precreateorder", preOrder) if resp.HttpStatusCode != HttpStatusSuccessCode { @@ -42,7 +42,7 @@ func (a *API) CreateOrder(order *CreateOrderReq) (sfOrderID, sfBillID string, to order.Version = DefaultVersion order.DevId = a.devId - order.ShopId = SFShopTestOpenStoreID //todo 测试用 删除 + //order.ShopId = SFShopTestOpenStoreID // 测试用 resp := a.HttpPostJson("createorder", order) if resp.HttpStatusCode != HttpStatusSuccessCode { From 4aabb5e6e410385a79629fbeb25ff05f131016eb Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 9 Jan 2024 17:55:21 +0800 Subject: [PATCH 5/5] 1 --- platformapi/dadaapi/order_test.go | 2 +- platformapi/sfps2/order.go | 4 ++-- platformapi/sfps2/sf_test.go | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/platformapi/dadaapi/order_test.go b/platformapi/dadaapi/order_test.go index 8e718b54..7a8ef03d 100644 --- a/platformapi/dadaapi/order_test.go +++ b/platformapi/dadaapi/order_test.go @@ -45,7 +45,7 @@ import ( //} // func TestCancel(t *testing.T) { - cancelResponse, err := dadaapi.CancelOrder("8000051859647401017", ReasonIDClientCanceled, "协商一致") + cancelResponse, err := dadaapi.CancelOrder("88442515379092", ReasonIDClientCanceled, "协商一致") if err != nil { t.Fatal(err) } diff --git a/platformapi/sfps2/order.go b/platformapi/sfps2/order.go index b77354cb..9dc95ab4 100644 --- a/platformapi/sfps2/order.go +++ b/platformapi/sfps2/order.go @@ -14,7 +14,7 @@ func (a *API) PreCreateOrder(preOrder *PreCreateOrderReq) (price float64, err er preOrder.PushTime = time.Now().Unix() preOrder.DevId = a.devId - //preOrder.ShopId = SFShopTestOpenStoreID // 测试用 + preOrder.ShopId = SFShopTestOpenStoreID // 测试用 resp := a.HttpPostJson("precreateorder", preOrder) if resp.HttpStatusCode != HttpStatusSuccessCode { @@ -42,7 +42,7 @@ func (a *API) CreateOrder(order *CreateOrderReq) (sfOrderID, sfBillID string, to order.Version = DefaultVersion order.DevId = a.devId - //order.ShopId = SFShopTestOpenStoreID // 测试用 + order.ShopId = SFShopTestOpenStoreID // 测试用 resp := a.HttpPostJson("createorder", order) if resp.HttpStatusCode != HttpStatusSuccessCode { diff --git a/platformapi/sfps2/sf_test.go b/platformapi/sfps2/sf_test.go index c2b51900..5bc40a29 100644 --- a/platformapi/sfps2/sf_test.go +++ b/platformapi/sfps2/sf_test.go @@ -65,7 +65,7 @@ func TestCreateOrder(t *testing.T) { DevId: AppID, ShopId: TestSFStoreID, ShopType: 1, - ShopOrderId: "20240108", + ShopOrderId: "20240109", OrderSequence: "测试", OrderSource: OrderSourceELM, OrderTime: 1694168441, @@ -135,3 +135,7 @@ func TestNew(t *testing.T) { fmt.Println(lng, lat) } } + +func TestInterfaceConverse(t *testing.T) { + +}