From 8059e292917804a575d94afa7f588d81db25bfd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 14 Dec 2020 16:06:06 +0800
Subject: [PATCH] ejy

---
 platformapi/ejyapi/ejyapi.go         | 6 +++++-
 platformapi/ejyapi/ejyapi_test.go    | 8 +++-----
 platformapi/jdapi/order_test.go      | 7 +++++++
 platformapi/jdapi/store_page_test.go | 8 ++++----
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/platformapi/ejyapi/ejyapi.go b/platformapi/ejyapi/ejyapi.go
index f3ec11ec..97a3f7bb 100644
--- a/platformapi/ejyapi/ejyapi.go
+++ b/platformapi/ejyapi/ejyapi.go
@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"sort"
 	"strings"
+	"time"
 
 	"git.rosy.net.cn/baseapi"
 	"git.rosy.net.cn/baseapi/platformapi"
@@ -128,6 +129,7 @@ type GetStationListResult struct {
 
 //获取油站列表
 func (a *API) GetStationList() (getStationListResult []*GetStationListResult, err error) {
+	a.SetTimestamp(time.Now().Unix())
 	params := make(map[string]interface{})
 	// params["platformName"] = a.platformName
 	sign := a.signParam(params)
@@ -167,6 +169,7 @@ type GetUserOrdersResult struct {
 
 //获取用户个人订单
 func (a *API) GetUserOrders(userPhone string, page int) (getUserOrdersResult *GetUserOrdersResult, err error) {
+	a.SetTimestamp(time.Now().Unix())
 	params := make(map[string]interface{})
 	params["stationIds"] = ""
 	params["page"] = page
@@ -188,10 +191,11 @@ type UserRefundResult struct {
 
 //用户申请退款
 func (a *API) UserRefund(orderId, userPhone, reason string) (userRefundResult *UserRefundResult, err error) {
+	a.SetTimestamp(time.Now().Unix())
 	params := make(map[string]interface{})
 	params["reason"] = reason
 	sign := a.signParam(params)
-	result, err := a.AccessAPI("oreo/ejiayou_open_api/platform/refund/v1/"+a.platformName+"/"+userPhone+"/"+orderId+"/"+sign+"/"+utils.Int64ToStr(a.timeStamp), TestUrl, params, false)
+	result, err := a.AccessAPI("oreo/ejiayou_open_api/platform/refund/v1/"+a.platformName+"/"+userPhone+"/"+orderId+"/"+sign+"/"+utils.Int64ToStr(a.timeStamp), Url, params, false)
 	if err == nil {
 		utils.Map2StructByJson(result["data"], &userRefundResult, false)
 	}
diff --git a/platformapi/ejyapi/ejyapi_test.go b/platformapi/ejyapi/ejyapi_test.go
index 8a2f0ff7..70c007e4 100644
--- a/platformapi/ejyapi/ejyapi_test.go
+++ b/platformapi/ejyapi/ejyapi_test.go
@@ -2,7 +2,6 @@ package ejyapi
 
 import (
 	"testing"
-	"time"
 
 	"git.rosy.net.cn/baseapi"
 	"git.rosy.net.cn/baseapi/utils"
@@ -18,9 +17,8 @@ func init() {
 	logger, _ := zap.NewDevelopment()
 	sugarLogger = logger.Sugar()
 	baseapi.Init(sugarLogger)
-	api = New("1Zbve", "ymsrrxlZXlmglK6Q", "MYsFZGgwwprIahzQ")
-	// api = New("1Zbve", "htvse3XEDhBnCTNo", "QM5RnGl6kNh3ENLT")
-	api.SetTimestamp(time.Now().Unix())
+	// api = New("1Zbve", "ymsrrxlZXlmglK6Q", "MYsFZGgwwprIahzQ")
+	api = New("1Zbve", "htvse3XEDhBnCTNo", "QM5RnGl6kNh3ENLT")
 }
 
 func TestGetStationList(t *testing.T) {
@@ -32,7 +30,7 @@ func TestGetStationList(t *testing.T) {
 }
 
 func TestGetUserOrders(t *testing.T) {
-	result, err := api.GetUserOrders("18980410281", 1)
+	result, err := api.GetUserOrders("13688462300", 1)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/platformapi/jdapi/order_test.go b/platformapi/jdapi/order_test.go
index ad560125..9f03a12e 100644
--- a/platformapi/jdapi/order_test.go
+++ b/platformapi/jdapi/order_test.go
@@ -175,3 +175,10 @@ func TestProcessQuestionPic(t *testing.T) {
 		}
 	}
 }
+
+func TestCancelAndRefund(t *testing.T) {
+	err := api.CancelAndRefund("2030098332000261", "jxadmin", "协商一致")
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+}
diff --git a/platformapi/jdapi/store_page_test.go b/platformapi/jdapi/store_page_test.go
index bb3c340c..9da12232 100644
--- a/platformapi/jdapi/store_page_test.go
+++ b/platformapi/jdapi/store_page_test.go
@@ -274,9 +274,9 @@ func TestGetJdShopOrders(t *testing.T) {
 }
 
 func TestGetJdTopSkus(t *testing.T) {
-	err := api.GetJdStoreInfo("12050477")
-	if err != nil {
-		t.Fatal(err)
-	}
+	// err := api.GetJdStoreInfo("12050477")
+	// if err != nil {
+	// 	t.Fatal(err)
+	// }
 	// t.Log(utils.Format4Output(result, false))
 }