From 5dacdee9b54c78372b68140e2b068d03a620eab9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 19:00:52 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java
index 79741ac..0b242eb 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java
@@ -27,6 +27,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.annotation.Resource;
import java.util.*;
/**
@@ -38,18 +39,21 @@
@Controller
@RequestMapping("/sysCouponActivity")
public class SysCouponActivityController extends BaseController {
-
+
private String PREFIX = "/system/sysCouponActivity/";
-
+
@Autowired
private ISysCouponActivityService sysCouponActivityService;
-
+
@Autowired
private ITUserService userService;
-
+
@Autowired
private ISysCouponRecordService couponRecordService;
-
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
+
/**
* 跳转到首页
*/
@@ -57,7 +61,7 @@
public String index() {
return PREFIX + "sysCouponActivity.html";
}
-
+
/**
* 跳转到选择优惠券页面
* @return
@@ -119,7 +123,7 @@
}
if(SinataUtil.isNotEmpty(couponUseType)){wrapper.eq("couponUseType",couponUseType);}
if(SinataUtil.isNotEmpty(status)){wrapper.eq("status",status);}
- ShiroUser user = ShiroExtUtil.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
if(user.getRoleType()!=1){
wrapper.eq("companyId",user.getObjectId());
wrapper.eq("companyType",user.getRoleType());
@@ -142,8 +146,8 @@
sysCouponActivity.setFullMoney(sysCouponRecord.getFullMoney());
sysCouponActivity.setInsertTime(new Date());
sysCouponActivity.setCouponId(activityId);
- sysCouponActivity.setCompanyId(ShiroExtUtil.getUser().getObjectId());
- sysCouponActivity.setCompanyType(ShiroExtUtil.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) {
@@ -257,8 +261,8 @@
sysCouponActivity.setFullMoney(sysCouponRecord.getFullMoney());
sysCouponActivity.setInsertTime(new Date());
sysCouponActivity.setCouponId(activityId);
- sysCouponActivity.setCompanyId(ShiroExtUtil.getUser().getObjectId());
- sysCouponActivity.setCompanyType(ShiroExtUtil.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