+ partner.ListOrders

+ AmendMissingOrders

business/partner/purchase/ebai/order.go

@@ -1,6 +1,7 @@
 package ebai
 
 import (
+	"fmt"
 	"math"
 	"time"
 
@@ -563,3 +564,43 @@ func (c *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.Goods
 	}
 	return err
 }
+
+func (c *PurchaseHandler) ListOrders(ctx *jxcontext.Context, parentTask tasksch.ITask, queryDate time.Time, vendorStoreID string) (vendorOrderIDs []string, err error) {
+	if utils.IsTimeZero(queryDate) {
+		return nil, fmt.Errorf("queryDate必须指定")
+	}
+	fromDate := utils.Time2Date(queryDate)
+	toDate := fromDate.Add(24*time.Hour - 1)
+	var shopList []*ebaiapi.ShopInfo
+	if vendorStoreID == "" {
+		shopList, err = api.EbaiAPI.ShopList(ebaiapi.SysStatusAll)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		shopList = []*ebaiapi.ShopInfo{
+			&ebaiapi.ShopInfo{
+				BaiduShopID: utils.Str2Int64(vendorStoreID),
+			},
+		}
+	}
+	task := tasksch.NewParallelTask("ebai ListOrders", nil, ctx,
+		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+			shop := batchItemList[0].(*ebaiapi.ShopInfo)
+			orderList, err := api.EbaiAPI.OrderListAll("", shop.BaiduShopID, fromDate.Unix(), toDate.Unix(), 0)
+			if err == nil {
+				retVal = orderList
+			}
+			return retVal, err
+		}, shopList)
+	tasksch.HandleTask(task, parentTask, true).Run()
+	orderList, err := task.GetResult(0)
+	if err == nil && len(orderList) > 0 {
+		vendorOrderIDs = make([]string, len(orderList))
+		for k, v := range orderList {
+			orderInfo := v.(*ebaiapi.ListOrderItemInfo)
+			vendorOrderIDs[k] = orderInfo.OrderID
+		}
+	}
+	return vendorOrderIDs, err
+}

business/partner/purchase/ebai/order_test.go

@@ -3,11 +3,22 @@ package ebai
 import (
 	"testing"
 
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+
 	"git.rosy.net.cn/baseapi/utils"
 )
 
 func TestGetOrder4PartRefund(t *testing.T) {
-	order, err := new(PurchaseHandler).GetOrder4PartRefund("1556529608021993938")
+	order, err := CurPurchaseHandler.GetOrder4PartRefund("1556529608021993938")
+	if err != nil {
+		t.Fatal(err.Error())
+	} else {
+		t.Log(utils.Format4Output(order, false))
+	}
+}
+
+func TestListOrders(t *testing.T) {
+	order, err := CurPurchaseHandler.ListOrders(jxcontext.AdminCtx, nil, utils.GetCurDate(), utils.DefaultTimeValue, "")
 	if err != nil {
 		t.Fatal(err.Error())
 	} else {