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/MerchantActivityController.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityController.java
index 45d4d0f..7acb694 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityController.java
@@ -7,13 +7,14 @@
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.service.*;
-import io.swagger.models.auth.In;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,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;
@@ -44,21 +46,24 @@
@Autowired
private IUserMerchantCouponService userMerchantCouponService;
-
+
@Autowired
private ITMerchantService merchantService;
-
+
@Autowired
private IMerchantActivitySlaveService merchantActivitySlaveService;
-
+
@Autowired
private IUserService userService;
-
+
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
@RequestMapping("/index")
public String index() {
return PREFIX + "merchantActivity.html";
}
-
+
/**
* @param startTime
* @param endTime
@@ -70,7 +75,7 @@
@RequestMapping("/list")
@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.list(startTime, endTime, type, merchantName, status, companyId, page);
@@ -140,7 +145,7 @@
@ResponseBody
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)) {
@@ -357,8 +362,8 @@
public Object activityExamineList(String startTime, String endTime, Integer type, Integer auditStatus) {
Integer companyId = null;
- if (ShiroExtUtil.getUser().getRoleType().equals(1)) {
- companyId = ShiroExtUtil.getUser().getObjectId();
+ if (shiroExtUtil.getUser().getRoleType().equals(1)) {
+ companyId = shiroExtUtil.getUser().getObjectId();
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
@@ -402,18 +407,18 @@
@RequestMapping("/examine")
@ResponseBody
public Object examine(Integer id, Integer state, String auditNote) {
-
+
MerchantActivity activity = merchantActivityService.selectById(id);
- Integer userId = ShiroExtUtil.getUser().getId();
+ Integer userId = shiroExtUtil.getUser().getId();
User user = userService.selectById(userId);
-
+
if (ToolUtil.isNotEmpty(activity)) {
activity.setAuditStatus(state);
activity.setAuditNote(auditNote);
activity.setAuditUserId(user.getObjectId());
activity.setAuditTime(new Date());
-
+
merchantActivityService.updateById(activity);
}
return SUCCESS_TIP;
--
Gitblit v1.7.1