Merge branch 'master' of e.coding.net:rosydev/baseapi

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)
 	}

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(temp, false), urlIndex)
 	result := make(map[string]interface{}, 0)
 	switch urlIndex {
 	case UrlIndexRiderStatus:

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 // 测试用
+
 	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 // 测试用
+
 	resp := a.HttpPostJson("createorder", order)
 	if resp.HttpStatusCode != HttpStatusSuccessCode {
 		return "", "", 0, 0, errors.New("HTTP请求错误，请检查重试")

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

platformapi/sfps2/sf_test.go

@@ -65,7 +65,7 @@ func TestCreateOrder(t *testing.T) {
 		DevId:         AppID,
 		ShopId:        TestSFStoreID,
 		ShopType:      1,
-		ShopOrderId:   "2023090806",
+		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) {
+
+}