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/MerchantActivityGiveController.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java
index e81bb93..d39026d 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java
@@ -8,10 +8,12 @@
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.log.LogObjectHolder;
-import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
-import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.model.MerchantActivity;
+import com.stylefeng.guns.modular.system.model.MerchantActivitySlave;
+import com.stylefeng.guns.modular.system.model.User;
+import com.stylefeng.guns.modular.system.model.UserMerchantCoupon;
import com.stylefeng.guns.modular.system.response.MerchantActivityVo;
import com.stylefeng.guns.modular.system.response.UserRequest;
import com.stylefeng.guns.modular.system.service.*;
@@ -25,6 +27,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@@ -46,15 +49,18 @@
private ITMerchantService merchantService;
@Autowired
private IUserMerchantCouponService userMerchantCouponService;
-
+
@Autowired
private IUserService userService;
-
+
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
@RequestMapping("/index")
public String index() {
return PREFIX + "merchantActivityGive.html";
}
-
+
/**
* @param startTime
* @param endTime
@@ -67,8 +73,8 @@
@ResponseBody
public Object list(String startTime, String endTime, Integer type, String merchantName, Integer status) {
- Integer companyId = ShiroExtUtil.getUser().getObjectId();
-
+ Integer companyId = shiroExtUtil.getUser().getObjectId();
+
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
List<Map<String, Object>> list = merchantActivityService.getMerchantActivityGiveList(startTime, endTime, type, merchantName, status, companyId, page);
page.setRecords(list);
@@ -230,7 +236,7 @@
@RequestMapping("/add")
public Object add(@RequestBody MerchantActivity activity) {
- Integer userId = ShiroExtUtil.getUser().getId();
+ Integer userId = shiroExtUtil.getUser().getId();
User user = userService.selectById(userId);
if (ToolUtil.isNotEmpty(user)) {
if (user.getRoleType().equals(2)) {
--
Gitblit v1.7.1