diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 6a3fd16b5..8f8dd250c 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -11,6 +11,7 @@ import ( "mime/multipart" "net/http" "regexp" + "sort" "strings" "sync" "time" @@ -49,6 +50,7 @@ var ( titleList = []string{ "用户名", "关联门店", + "状态", } ) @@ -60,6 +62,7 @@ type GetJdUsersStruct struct { type JdUserStruct struct { UserName string `json:"用户名"` StoreIDs string `json:"关联门店"` + Status string `json:"状态"` } func init() { @@ -1473,20 +1476,19 @@ func GetJdUsers(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint pageNoList []int storeUserList []interface{} ) - //获取京东有效的店 db := dao.GetDB() + //获取京东商城所有用户 + _, _, 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] = v.VendorStoreID + 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: - //获取京东商城所有用户 - _, _, 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) @@ -1506,16 +1508,17 @@ func GetJdUsers(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint if jxVendorIDsMap[v] == "" { continue } - vendorStoreIDsMap[v] = v + vendorStoreIDsMap[v] = jxVendorIDsMap[v] } if len(vendorStoreIDsMap) == 0 { - jdStruct := JdUserStruct{vv.LoginName, ""} + jdStruct := JdUserStruct{vv.LoginName, "", vv.LockStatus} jdUsersStruct.AppendData(jdStruct) } else { for _, m := range vendorStoreIDsMap { vendorStoreIDsResult = append(vendorStoreIDsResult, m) } - jdStruct := JdUserStruct{vv.LoginName, strings.Join(vendorStoreIDsResult, ",")} + sort.Strings(vendorStoreIDsResult[:]) + jdStruct := JdUserStruct{vv.LoginName, strings.Join(vendorStoreIDsResult, ","), vv.LockStatus} jdUsersStruct.AppendData(jdStruct) } return retVal, err