From 61b2d479bf4887902d21c5c99d9b65bf9cc8d27a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 十月 2025 11:56:08 +0800
Subject: [PATCH] 提交代码
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
index b4eb4d4..d2fe13c 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.base.tips.SuccessTip;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.DateUtil;
@@ -56,13 +57,16 @@
@Autowired
private ITAppUserService appUserService;
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
+
/**
* 跳转到首页
*/
@RequestMapping("")
public String index(Model model) {
- Integer roleType = ShiroKit.getUser().getRoleType();
- Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
List<TBranchOffice> branchOfficeList = new ArrayList<>();
if(roleType == 1){
branchOfficeList = branchOfficeService.selectList(new EntityWrapper<TBranchOffice>().eq("status",1));
@@ -101,8 +105,8 @@
@RequestMapping(value = "/list")
@ResponseBody
public Object list(Integer couponType,Integer couponServiceType,String createTime,Integer branchOfficeId) {
- Integer roleType = ShiroKit.getUser().getRoleType();
- Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
EntityWrapper<TCoupon> wrapper = new EntityWrapper<>();
if(Objects.nonNull(couponType)){
wrapper.eq("coupon_type",couponType);
@@ -158,8 +162,8 @@
@RequestMapping(value = "/userToCouponList")
@ResponseBody
public Object userToCouponList(Integer activityId) {
- Integer roleType = ShiroKit.getUser().getRoleType();
- Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
// 查询活动信息
List<TActivityCoupon> activityCoupons = activityCouponService.selectList(new EntityWrapper<TActivityCoupon>().eq("activityId", activityId));
@@ -193,8 +197,8 @@
@RequestMapping(value = "/activityCouponList")
@ResponseBody
public Object activityCouponList(String couponName) {
- Integer roleType = ShiroKit.getUser().getRoleType();
- Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
EntityWrapper<TCoupon> wrapper = new EntityWrapper<>();
if(StringUtils.hasLength(couponName)){
wrapper.like("coupon_name",couponName);
@@ -217,8 +221,8 @@
@RequestMapping(value = "/activityCouponNewList")
@ResponseBody
public Object activityCouponNewList(String createTime,Integer couponType,Integer couponServiceType) {
- Integer roleType = ShiroKit.getUser().getRoleType();
- Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
Date startTime = null;
Date endTime = null;
if (SinataUtil.isNotEmpty(createTime)){
@@ -280,8 +284,8 @@
// }
// }
- Integer roleType = ShiroKit.getUser().getRoleType();
- Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
if(roleType == 2){
tCoupon.setBranchOfficeId(objectId);
}
@@ -377,12 +381,12 @@
tUserToCoupon.setExpireTime(expireTime);
// 添加发放人id和类型
- if(ShiroKit.getUser().getRoleType() == 1){
+ if(shiroExtUtil.getUser().getRoleType() == 1){
tUserToCoupon.setObjectId(1);
}else {
- tUserToCoupon.setObjectId(ShiroKit.getUser().getObjectId());
+ tUserToCoupon.setObjectId(shiroExtUtil.getUser().getObjectId());
}
- tUserToCoupon.setRoleType(ShiroKit.getUser().getRoleType());
+ tUserToCoupon.setRoleType(shiroExtUtil.getUser().getRoleType());
tUserToCoupons.add(tUserToCoupon);
}
--
Gitblit v1.7.1