From fc5fd913d680e0c40bc042fddcb2220b80a56cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 12 Nov 2022 09:59:41 +0800 Subject: [PATCH] 1 --- platformapi/jdapi/jdapi.go | 1 + platformapi/jdapi/order_test.go | 13 ++++++++----- utils/utils_crypt.go | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/platformapi/jdapi/jdapi.go b/platformapi/jdapi/jdapi.go index d952b6d5..97d3e278 100644 --- a/platformapi/jdapi/jdapi.go +++ b/platformapi/jdapi/jdapi.go @@ -400,6 +400,7 @@ func (a *API) AccessAPIHavePage(apiStr string, jdParams map[string]interface{}, if err := utils.UnmarshalUseNumber(encryptData, &data); err != nil { return nil, totalCount, platformapi.ErrResponseDataFormatWrong } + innerCode := forceInnerCode2Str(data["code"]) if innerCode != "0" { err2 := utils.NewErrorCode(getErrMsgFromData(data), innerCode, 1) diff --git a/platformapi/jdapi/order_test.go b/platformapi/jdapi/order_test.go index 2cd24f6a..fe76fb47 100644 --- a/platformapi/jdapi/order_test.go +++ b/platformapi/jdapi/order_test.go @@ -124,12 +124,15 @@ func TestOrderAddTips(t *testing.T) { } func TestOrderQuery2(t *testing.T) { + //orderList, _, err := api.OrderQuery2(&OrderQueryParam{ + // OrderPurchaseTimeBegin: "2022-11-05 00:00:00", + // OrderPurchaseTimeEnd: "2022-11-05 23:59:59", + // DeliveryStationNo: "11954632", + // PageNo: 1, + // PageSize: 99999, + //}) orderList, _, err := api.OrderQuery2(&OrderQueryParam{ - OrderPurchaseTimeBegin: "2022-11-05 00:00:00", - OrderPurchaseTimeEnd: "2022-11-05 23:59:59", - DeliveryStationNo: "11954632", - PageNo: 1, - PageSize: 99999, + OrderID: 2227217383000174, }) t.Log(utils.Format4Output(orderList, false)) if err != nil { diff --git a/utils/utils_crypt.go b/utils/utils_crypt.go index e8505a71..3596ee68 100644 --- a/utils/utils_crypt.go +++ b/utils/utils_crypt.go @@ -27,7 +27,7 @@ func AESCBCDecpryt(encryptedData, aesKey, iv []byte) (decryptedData []byte, err decryptedData = make([]byte, len(encryptedData)) cfbdec.CryptBlocks(decryptedData, encryptedData) - decryptedData = PKCSUnPadding(decryptedData) + //decryptedData = PKCSUnPadding(decryptedData) return decryptedData, nil }