From 4839bc241ca3c4c7a007ae8d4321ec3e40fb8f6e Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Fri, 23 Jul 2021 17:10:06 +0800
Subject: [PATCH] aa

---
 platformapi/tibiotapi/tibiotapi.go      | 18 +++++++++++++-----
 platformapi/tibiotapi/tibiotapi_test.go |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/platformapi/tibiotapi/tibiotapi.go b/platformapi/tibiotapi/tibiotapi.go
index 46e6e1a4..ceba4a57 100644
--- a/platformapi/tibiotapi/tibiotapi.go
+++ b/platformapi/tibiotapi/tibiotapi.go
@@ -133,14 +133,22 @@ type BatchQueryCardInfoResult struct {
 		Opencardtime string `json:"openCardTime"`
 		Activatetime string `json:"activateTime"`
 		Packagetime  string `json:"packageTime"`
+		PrintNo      string `json:"print_no"`
 	} `json:"records"`
 }
 
-func (a *API) BatchQueryCardInfo(pageNum int) (batchQueryCardInfoResult *BatchQueryCardInfoResult, err error) {
-	result, err := a.AccessAPI("card/batchQueryCardInfo", map[string]interface{}{
-		"pageNum":  1,
-		"cardType": 1,
-	}, true)
+type BatchQueryCardInfoParam struct {
+	IccID            string `json:"iccid,omitempty"`
+	CardStatus       int    `json:"cardStatus,omitempty"`
+	CardType         int    `json:"cardType,omitempty"`
+	PageNum          int    `json:"pageNum,omitempty"`
+	PageSize         int    `json:"pageSize,omitempty"`
+	BeginPackageTime string `json:"beginPackageTime,omitempty"`
+	EndPackageTime   string `json:"endPackageTime,omitempty"`
+}
+
+func (a *API) BatchQueryCardInfo(batchQueryCardInfoParam *BatchQueryCardInfoParam) (batchQueryCardInfoResult *BatchQueryCardInfoResult, err error) {
+	result, err := a.AccessAPI("card/batchQueryCardInfo", utils.Struct2FlatMap(batchQueryCardInfoParam), true)
 	if err == nil {
 		utils.Map2StructByJson(result, &batchQueryCardInfoResult, false)
 	}
diff --git a/platformapi/tibiotapi/tibiotapi_test.go b/platformapi/tibiotapi/tibiotapi_test.go
index 4a8386bd..b55523b9 100644
--- a/platformapi/tibiotapi/tibiotapi_test.go
+++ b/platformapi/tibiotapi/tibiotapi_test.go
@@ -29,7 +29,7 @@ func TestGetCardInfo(t *testing.T) {
 }
 
 func TestBatchQueryCardInfo(t *testing.T) {
-	result, err := api.BatchQueryCardInfo(1)
+	result, err := api.BatchQueryCardInfo(nil)
 	if err != nil {
 		t.Fatalf("PrintMsg return error:%v", err)
 	}