This commit is contained in:
苏尹岚
2021-04-06 14:09:33 +08:00
parent 950ca404eb
commit 0ddc5efa12
5 changed files with 14 additions and 12 deletions

View File

@@ -7,7 +7,7 @@ import (
)
func TestOrderGet(t *testing.T) {
result, err := api.OrderGet("5020191712108978238")
result, err := api.OrderGet("2147234624018417846")
if err != nil {
t.Fatal(err)
} else {
@@ -16,7 +16,7 @@ func TestOrderGet(t *testing.T) {
}
func TestOrderGet2(t *testing.T) {
result, err := api.OrderGet2("2141992244233627664")
result, err := api.OrderGet2("2147234624018417846")
if err != nil {
t.Fatal(err)
} else {

File diff suppressed because one or more lines are too long

View File

@@ -329,7 +329,7 @@ type AllOrdersParam struct {
OrderID string `json:"orderId"`
SkuName string `json:"skuName"`
OrderCreateDateRange []string `json:"orderCreateDateRange"`
OrderCompleteDateRange []interface{} `json:"orderCompleteDateRange"`
OrderCompleteDateRange []interface{} `json:"orderCompleteDateRange",omitempty`
ReceiverName string `json:"receiverName"`
ReceiverTel string `json:"receiverTel"`
UserPin string `json:"userPin"`
@@ -341,7 +341,7 @@ type AllOrdersParam struct {
DeliveryType string `json:"deliveryType"`
StoreID string `json:"storeId"`
HuoHao string `json:"huoHao"`
OrderStatusArray []interface{} `json:"orderStatusArray"`
OrderStatusArray []string `json:"orderStatusArray,omitempty"`
SelectedTabName string `json:"selectedTabName"`
}
@@ -484,8 +484,8 @@ func (a *API) AllOrders(allOrdersParam *AllOrdersParam) (allOrdersResult *AllOrd
"sortName": "desc",
"orderCreateDateRange": allOrdersParam.OrderCreateDateRange,
// "storeId": allOrdersParam.StoreID,
"orderStatusArray": allOrdersParam.OrderStatusArray,
"orderId": allOrdersParam.OrderID,
// "orderStatusArray": allOrdersParam.OrderStatusArray,
"orderId": allOrdersParam.OrderID,
}, true)
if err == nil {
utils.Map2StructByJson(result, &allOrdersResult, false)

View File

@@ -59,9 +59,10 @@ func Test11(t *testing.T) {
func TestAllOrders(t *testing.T) {
result, err := api.AllOrders(&AllOrdersParam{
Current: 1,
PageSize: 1,
OrderID: "118793082128",
Current: 1,
PageSize: 10,
OrderCreateDateRange: []string{"2021-04-05 00:00:00", "2021-04-06 23:59:59"},
// OrderID: "118793082128",
})
if err != nil {
t.Fatal(err)

View File

@@ -6,13 +6,14 @@ import (
"fmt"
"runtime/debug"
"git.rosy.net.cn/baseapi"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/baseapi/utils"
)
const (
chanPoolSize = 8
chanPoolSize = 20
)
type TaskParam struct {
@@ -61,7 +62,7 @@ func callHandler(handler func()) (retVal interface{}) {
func taskFun(taskChan chan *TaskParam, index int) {
for {
taskParam := <-taskChan
// baseapi.SugarLogger.Debugf("routine:%d, handle task:%v", index, taskParam.handler)
baseapi.SugarLogger.Debugf("routine:%d, handle task:%v", index, taskParam.handler)
result := callHandler(taskParam.handler)
if taskParam.resultChan != nil {
taskParam.resultChan <- result