From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Sat, 17 Jul 2021 15:59:10 +0800 Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示 --- zq-erp/src/main/java/com/matrix/system/common/actions/SysRoleAction.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/SysRoleAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/SysRoleAction.java index 3920353..d242a64 100644 --- a/zq-erp/src/main/java/com/matrix/system/common/actions/SysRoleAction.java +++ b/zq-erp/src/main/java/com/matrix/system/common/actions/SysRoleAction.java @@ -1,5 +1,6 @@ package com.matrix.system.common.actions; +import com.matrix.component.redis.RedisClient; import com.matrix.core.anotations.RemoveRequestToken; import com.matrix.core.anotations.SaveRequestToken; import com.matrix.core.constance.MatrixConstance; @@ -9,6 +10,7 @@ import com.matrix.core.tools.StringUtils; import com.matrix.core.tools.WebUtil; import com.matrix.core.web.BaseAction; +import com.matrix.system.common.authority.DefaultAuthorityManager; import com.matrix.system.common.bean.SysFnBtnRel; import com.matrix.system.common.bean.SysFunction; import com.matrix.system.common.bean.SysRole; @@ -16,7 +18,6 @@ import com.matrix.system.common.constance.AppVocabularyCode; import com.matrix.system.common.service.SysFunctionService; import com.matrix.system.common.service.SysRoleService; -import com.matrix.system.constance.Dictionary; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; @@ -49,7 +50,8 @@ private SysFunctionService sysFunctionService; public static final String BEV = "SYSROLE_BEV"; - + @Autowired + RedisClient redisClient; /** * 列表显示 * @@ -230,9 +232,11 @@ } AjaxResult result = modify(sysRoleService, WebUtil.getSessionAttribute(BEV), sysRole, AppVocabularyCode.ROLE); WebUtil.removeSessionAttribute(BEV); + redisClient.batchDel(DefaultAuthorityManager.USER_POWER_REDISKEY); return result; } + /** * 进入修改界面 * -- Gitblit v1.9.1