京东api修改

business/jxstore/cms/user2.go

@@ -8,6 +8,10 @@ import (
 	"sync"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/business/partner/purchase/jd"
+
+	"git.rosy.net.cn/jx-callback/globals/api/apimanager"
+
 	"git.rosy.net.cn/baseapi"
 	"git.rosy.net.cn/baseapi/platformapi/jdapi"
 	"git.rosy.net.cn/jx-callback/business/jxutils/excel"
@@ -814,31 +818,33 @@ func GetJdUsers(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint
 	)
 	db := dao.GetDB()
 	jdUsersStruct.userMap = jdUsersStruct.userMap[0:0]
-	//获取京东商城所有用户
-	_, _, toatlPage, _ := api.JdAPI.PrivilegeSearchUser(1)
-	for i := 1; i <= toatlPage; i++ {
-		pageNoList = append(pageNoList, i)
-	}
-	storeMapList, err := dao.GetStoreMapsListWithoutDisabled(db, []int{model.VendorIDJD}, model.StoreStatusDisabled)
-	for _, v := range storeMapList {
-		jxVendorIDsMap[v.VendorStoreID] = utils.Int64ToStr(int64(v.StoreID))
-	}
 	taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
 		switch step {
 		case 0:
+			//获取京东商城所有用户
+			apiList := apimanager.CurAPIManager.GetAppOrgCodeList(model.VendorIDJD)
+			for _, v := range apiList {
+				_, _, toatlPage, _ := jd.GetAPI(v).PrivilegeSearchUser(1)
+				for i := 1; i <= toatlPage; i++ {
+					pageNoList = append(pageNoList, i)
+				}
+				storeMapList, _ := dao.GetStoreMapsListWithoutDisabled(db, []int{model.VendorIDJD}, model.StoreStatusDisabled)
+				for _, v := range storeMapList {
+					jxVendorIDsMap[v.VendorStoreID] = utils.Int64ToStr(int64(v.StoreID))
+				}
 				taskFunc1 := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 					pageNo := batchItemList[0].(int)
-				storeUserLists, _, _, err := api.JdAPI.PrivilegeSearchUser(pageNo)
+					storeUserLists, _, _, err := jd.GetAPI(v).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)
+					vendorStoreIDs, err := jd.GetAPI(v).GetJdUserBindStoreIDs(vv.ID)
 					var vendorStoreIDsMap = make(map[string]string, len(vendorStoreIDs))
 					var vendorStoreIDsResult []string
 					var roleNameStr string
@@ -851,11 +857,11 @@ func GetJdUsers(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint
 					if vv.RoleNameStr != "" {
 						roleNameStr = strings.ReplaceAll(vv.RoleNameStr, " ", "")
 						if roleNameStr != jdapi.JdUserRoleJHYName && roleNameStr != jdapi.JdUserRolesName && roleNameStr != jdapi.JdUserNoRole {
-						api.JdAPI.UpdateJdUserRoles(int64(vv.ID), []string{jdapi.JdUserRoleJHYId})
+							jd.GetAPI(v).UpdateJdUserRoles(int64(vv.ID), []string{jdapi.JdUserRoleJHYId})
 						}
 					}
 					if len(vendorStoreIDsMap) == 0 {
-					isManager, _ := api.JdAPI.IsJdManagerUser(int64(vv.ID))
+						isManager, _ := jd.GetAPI(v).IsJdManagerUser(int64(vv.ID))
 						if isManager {
 							jdStruct := JdUserStruct{vv.LoginName, "商家管理员", vv.RoleNameStr, vv.LockStatus}
 							jdUsersStruct.AppendData(jdStruct)
@@ -875,21 +881,22 @@ func GetJdUsers(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint
 				taskParallel := tasksch.NewParallelTask("获取京东商城用户关联门店列表", tasksch.NewParallelConfig(), ctx, taskFunc, storeUserList)
 				tasksch.HandleTask(taskParallel, task, true).Run()
 				disabledIdList, err = taskParallel.GetResult(0)
-		case 2:
+
 				taskFunc2 := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 					id := batchItemList[0].(int64)
-				api.JdAPI.PrivilegeUpdateJdUserStatus(id, jdapi.JdUserStatusDisable)
+					jd.GetAPI(v).PrivilegeUpdateJdUserStatus(id, jdapi.JdUserStatusDisable)
 					return retVal, err
 				}
 				taskParallel2 := tasksch.NewParallelTask("禁用未关联活跃门店用户", tasksch.NewParallelConfig(), ctx, taskFunc2, disabledIdList)
 				tasksch.HandleTask(taskParallel2, task, true).Run()
 				_, err = taskParallel2.GetResult(0)
-		case 3:
+			}
+		case 1:
 			WriteToExcelJd(task, jdUsersStruct.userMap)
 		}
 		return result, err
 	}
-	taskSeq := tasksch.NewSeqTask2("获取京东商城用户关联门店列表-序列任务", ctx, isContinueWhenError, taskSeqFunc, 4)
+	taskSeq := tasksch.NewSeqTask2("获取京东商城用户关联门店列表-序列任务", ctx, isContinueWhenError, taskSeqFunc, 2)
 	tasksch.HandleTask(taskSeq, nil, true).Run()
 	if !isAsync {
 		_, err = taskSeq.GetResult(0)