From f2530067b6cd16a87b76190cf524d2ed75bf9592 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 11 十月 2025 14:26:54 +0800
Subject: [PATCH] 集成中台及正联功能
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java
index 06d0d5f..8e165c1 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;
@@ -50,6 +51,9 @@
@Autowired
private ISysCouponRecordService couponRecordService;
+
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
/**
* 跳转到首页
@@ -120,7 +124,7 @@
}
if(SinataUtil.isNotEmpty(couponUseType)){wrapper.eq("couponUseType",couponUseType);}
if(SinataUtil.isNotEmpty(status)){wrapper.eq("status",status);}
- ShiroUser user = ShiroKit.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
if(user.getRoleType()!=1){
wrapper.eq("companyId",user.getObjectId());
wrapper.eq("companyType",user.getRoleType());
@@ -143,8 +147,8 @@
sysCouponActivity.setFullMoney(sysCouponRecord.getFullMoney());
sysCouponActivity.setInsertTime(new Date());
sysCouponActivity.setCouponId(activityId);
- sysCouponActivity.setCompanyId(ShiroKit.getUser().getObjectId());
- sysCouponActivity.setCompanyType(ShiroKit.getUser().getRoleType());
+ sysCouponActivity.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ sysCouponActivity.setCompanyType(shiroExtUtil.getUser().getRoleType());
sysCouponActivity.setStatus(sysCouponActivity.getCompanyType()==1?3:1);
sysCouponActivityService.insert(sysCouponActivity);
if(sysCouponActivity.getCompanyType()==1){
@@ -258,8 +262,8 @@
sysCouponActivity.setFullMoney(sysCouponRecord.getFullMoney());
sysCouponActivity.setInsertTime(new Date());
sysCouponActivity.setCouponId(activityId);
- sysCouponActivity.setCompanyId(ShiroKit.getUser().getObjectId());
- sysCouponActivity.setCompanyType(ShiroKit.getUser().getRoleType());
+ sysCouponActivity.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ sysCouponActivity.setCompanyType(shiroExtUtil.getUser().getRoleType());
sysCouponActivity.setStatus(sysCouponActivity.getCompanyType()==1?3:1);
sysCouponActivityService.updateById(sysCouponActivity);
return SUCCESS_TIP;
--
Gitblit v1.7.1