diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 11e24dc9c..6a3fd16b5 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -1470,6 +1470,8 @@ func ExecuteFileName(filename string) (name string) { func GetJdUsers(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint string, err error) { var ( jxVendorIDsMap = make(map[string]string) + pageNoList []int + storeUserList []interface{} ) //获取京东有效的店 db := dao.GetDB() @@ -1477,11 +1479,24 @@ func GetJdUsers(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint for _, v := range storeMapList { jxVendorIDsMap[v.VendorStoreID] = v.VendorStoreID } - //获取京东商城所有用户 - storeUserList, err := api.JdAPI.PrivilegeSearchUserAll() taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { switch step { case 0: + //获取京东商城所有用户 + _, _, toatlPage, _ := api.JdAPI.PrivilegeSearchUser(1) + for i := 1; i <= toatlPage; i++ { + pageNoList = append(pageNoList, i) + } + taskFunc1 := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + pageNo := batchItemList[0].(int) + storeUserLists, _, _, err := api.JdAPI.PrivilegeSearchUser(pageNo) + retVal = storeUserLists + return retVal, err + } + taskParallel1 := tasksch.NewParallelTask("获取京东商城所有用户列表", tasksch.NewParallelConfig(), ctx, taskFunc1, pageNoList) + tasksch.HandleTask(taskParallel1, task, true).Run() + storeUserList, err = taskParallel1.GetResult(0) + case 1: taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { vv := batchItemList[0].(*jdapi.StoreUserInfo) vendorStoreIDs, err := api.JdAPI.GetJdUserBindStoreIDs(vv.ID) @@ -1505,16 +1520,16 @@ func GetJdUsers(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint } return retVal, err } - taskParallel := tasksch.NewParallelTask("获取京东商城用户列表", tasksch.NewParallelConfig(), ctx, taskFunc, storeUserList) + taskParallel := tasksch.NewParallelTask("获取京东商城用户关联门店列表", tasksch.NewParallelConfig(), ctx, taskFunc, storeUserList) tasksch.HandleTask(taskParallel, task, true).Run() _, err = taskParallel.GetResult(0) - case 1: + case 2: //写excel WriteToExcel(task, jdUsersStruct.userMap) } return result, err } - taskSeq := tasksch.NewSeqTask2("获取京东商城用户列表-序列任务", ctx, isContinueWhenError, taskSeqFunc, 2) + taskSeq := tasksch.NewSeqTask2("获取京东商城用户关联门店列表-序列任务", ctx, isContinueWhenError, taskSeqFunc, 3) tasksch.HandleTask(taskSeq, nil, true).Run() if !isAsync { _, err = taskSeq.GetResult(0) diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index d6b68989d..2d5c62775 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -83,12 +83,11 @@ func QueryOrders(db *DaoDB, vendorOrderID string, actID int, vendorIDs []int, st AND t2.store_id = IF(t4.jx_store_id <> 0, t4.jx_store_id, t4.store_id) AND t4.order_created_at BETWEEN t1.begin_at AND t1.end_at WHERE t1.status = 1 - AND t1.type = ? AND t1.id = ? GROUP BY 1,2 )s ON s.vendor_order_id = a.vendor_order_id AND s.vendor_id = a.vendor_id ` - sqlParams = append(sqlParams, model.ActSkuFake, actID) + sqlParams = append(sqlParams, actID) } sql += ` WHERE 1=1