From 9e46a9195d188efe49bba30c2677f570817c4028 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 27 Sep 2019 18:37:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=93=E8=81=94=E4=BA=91=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=9C=BA=E6=B7=BB=E5=8A=A0GetOrderPagingList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformapi/yilianyunapi/yilianyunapi.go | 22 +++++++++++++++++++ platformapi/yilianyunapi/yilianyunapi_test.go | 12 +++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/platformapi/yilianyunapi/yilianyunapi.go b/platformapi/yilianyunapi/yilianyunapi.go index 2f562bf0..ef08c085 100644 --- a/platformapi/yilianyunapi/yilianyunapi.go +++ b/platformapi/yilianyunapi/yilianyunapi.go @@ -56,6 +56,15 @@ type TokenInfo struct { MachineCode string `json:"machine_code"` } +type PrinterOrderResult struct { + Content string `json:"content"` + ID string `json:"id"` + OriginID string `json:"origin_id"` + PrintTime string `json:"print_time"` + ReceivingTime string `json:"receiving_time"` + Status int `json:"status"` +} + func New(clientID, clientSecret string, config ...*platformapi.APIConfig) *API { curConfig := platformapi.DefAPIConfig if len(config) > 0 { @@ -256,3 +265,16 @@ func (a *API) CancelAll(machineCode, token string) (err error) { func (a *API) PlayText(machineCode, orderID, text, token string) (err error) { return a.printMsg(machineCode, orderID, fmt.Sprintf("", strings.Replace(text, ",", ".", -1)), token) } + +// pageIndex从1开始，pageSize最大为100 +func (a *API) GetOrderPagingList(machineCode, token string, pageIndex, pageSize int) (orderResultList []*PrinterOrderResult, err error) { + result, err := a.AccessAPI("printer/getorderpaginglist", map[string]interface{}{ + "machine_code": machineCode, + "page_index": pageIndex, + "page_size": pageSize, + }, token) + if err != nil { + err = utils.Map2StructByJson(result, &orderResultList, false) + } + return orderResultList, err +} diff --git a/platformapi/yilianyunapi/yilianyunapi_test.go b/platformapi/yilianyunapi/yilianyunapi_test.go index 0117898c..f39b0601 100644 --- a/platformapi/yilianyunapi/yilianyunapi_test.go +++ b/platformapi/yilianyunapi/yilianyunapi_test.go @@ -20,11 +20,11 @@ func init() { baseapi.Init(sugarLogger) // 自有应用 - // api = New("1039586024", "4885d07c2997b661102e4b6099c0bf3b") - // api.SetToken("7884617f9eeb4c28933569f94a95b5c3") + api = New("1039586024", "4885d07c2997b661102e4b6099c0bf3b") + api.SetToken("3a38e3cec7974b459a6f0a381c9b0312") // 开放应用 - api = New("1098307169", "d5eedb40c99e6691b1ca2ba82a363d6a") + // api = New("1098307169", "d5eedb40c99e6691b1ca2ba82a363d6a") } func handleError(t *testing.T, err error) { @@ -97,3 +97,9 @@ func TestRefreshToken(t *testing.T) { handleError(t, err) t.Log(utils.Format4Output(tokenInfo, true)) } + +func TestGetOrderPagingList(t *testing.T) { + result, err := api.GetOrderPagingList("4004613792", "", 1, 50) + handleError(t, err) + t.Log(utils.Format4Output(result, true)) +}