diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index e64799db3..a547db60d 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4088,3 +4088,24 @@ func GetStoreAcctBalance(ctx *jxcontext.Context, storeID int) (storeAcct *model. // dao.GetStoresMapList(db, []int{model.VendorIDJD, model.VendorIDMTWM, model.VendorIDEBAI}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "") // return err // } + +func RefreshStoreBind(ctx *jxcontext.Context) (err error) { + var ( + db = dao.GetDB() + ) + stores, err := dao.GetStoreList(db, nil, nil, []int{model.StoreStatusClosed, model.StoreStatusHaveRest, model.StoreStatusOpened}, nil, nil, "") + task := tasksch.NewParallelTask("RefreshStoreBind", tasksch.NewParallelConfig().SetParallelCount(5).SetIsContinueWhenError(true), ctx, + func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + store := batchItemList[0].(*model.Store) + var userIDs []string + userList := getAllUsers4Store(ctx, db, store) + for _, v := range userList { + userIDs = append(userIDs, v.UserID) + } + err = AddUsers4Role(ctx, autils.NewRole(authz.StoreRoleBoss, store.ID), userIDs) + return retVal, err + }, stores) + tasksch.HandleTask(task, nil, true).Run() + task.GetID() + return err +} diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 7b9d16948..7aada02a4 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -282,7 +282,7 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b SELECT SQL_CALC_FOUND_ROWS a.*, c.store_id FROM sku_name a LEFT JOIN sku b ON b.name_id = a.id AND b.status = ? AND b.deleted_at = ? - JOIN store d ON d.deleted_at = ? AND d.id = ? + JOIN store e ON e.deleted_at = ? AND e.id = ? ` sqlParams = append(sqlParams, model.SkuStatusNormal, utils.DefaultTimeValue, @@ -294,7 +294,7 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b ` } sql += ` - JOIN store_sku_bind c ON c.sku_id = b.id AND c.deleted_at = ? AND c.store_id = d.id + JOIN store_sku_bind c ON c.sku_id = b.id AND c.deleted_at = ? AND c.store_id = e.id ` sqlParams = append(sqlParams, utils.DefaultTimeValue) if status != -1 { @@ -321,7 +321,7 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b WHERE t1.deleted_at = ? AND t1.status = ? AND NOT (t1.begin_at > ? OR t1.end_at < ?) AND t2.store_id = ? GROUP BY 1,2 - ) ta ON ta.store_id = d.id AND ta.sku_id = b.id + ) ta ON ta.store_id = e.id AND ta.sku_id = b.id ` sqlParams = append(sqlParams, utils.DefaultTimeValue, diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go index dd5a6afa6..750124564 100644 --- a/business/jxstore/cms/user2.go +++ b/business/jxstore/cms/user2.go @@ -8,8 +8,6 @@ import ( "sync" "time" - "git.rosy.net.cn/jx-callback/business/jxstore/permission" - "git.rosy.net.cn/jx-callback/business/partner/purchase/jd" "git.rosy.net.cn/jx-callback/globals/api/apimanager" @@ -571,13 +569,13 @@ func AddUsers4Role(ctx *jxcontext.Context, r *authz.RoleInfo, userIDList []strin errList := errlist.New() for _, v := range userIDList { - if permission.IsRoledByUserID(v) { - if storeIDsMap, err := permission.GetUserStoresResultMap(v); err == nil { - if storeIDsMap[r.StoreID] == 0 { - return fmt.Errorf("此用户没有该门店[%v]的权限,无法添加到分组", r.StoreID) - } - } - } + // if permission.IsRoledByUserID(v) { + // if storeIDsMap, err := permission.GetUserStoresResultMap(v); err == nil { + // if storeIDsMap[r.StoreID] == 0 { + // return fmt.Errorf("此用户没有该门店[%v]的权限,无法添加到分组", r.StoreID) + // } + // } + // } if err = checkUserType(v, model.UserTypeNonConsumer); err != nil { return err diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index f65ef16c2..6e3ecd1ca 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -433,6 +433,8 @@ func doDailyWork2() { cms.SyncJdsStoreStock(jxcontext.AdminCtx, true, true) //刷新京东商城订单结算价 orderman.RefreshJdShopOrdersEarningPrice(jxcontext.AdminCtx, utils.Time2Str(time.Now().AddDate(0, 0, -2)), utils.Time2Str(time.Now())) + //刷新门店分组管理 + cms.RefreshStoreBind(jxcontext.AdminCtx) } func doDailyWork() {