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/UserActivityController.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
index d858278..02b7e03 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
@@ -1,27 +1,25 @@
package com.stylefeng.guns.modular.system.controller.general;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-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.page.PageInfoBT;
-import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
@@ -60,23 +58,26 @@
@Autowired
private ISysCouponRecordService sysCouponRecordService;
-
+
@Autowired
private ISysRedPacketRecordService sysRedPacketRecordService;
-
+
@Autowired
private IUserCouponRecordService userCouponRecordService;
-
+
@Autowired
private ITUserRedPacketRecordService redPacketRecordService;
-
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
/**
* 跳转领取统计
+ *
* @return
*/
@RequestMapping("/receiveRecord")
- public String receiveRecord(Model model,Integer activityId){
- model.addAttribute("activityId",activityId);
+ public String receiveRecord(Model model, Integer activityId) {
+ model.addAttribute("activityId", activityId);
UserActivity userActivity = userActivityService.selectById(activityId);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
model.addAttribute("startTime", sdf.format(userActivity.getStartTime()));
@@ -264,16 +265,16 @@
@RequestMapping(value = "/blanceList")
@ResponseBody
public Object blanceList(String createTime,Integer activityId) {
- ShiroUser user = ShiroExtUtil.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
String beginTime = null;
String endTime = null;
- if (SinataUtil.isNotEmpty(createTime)){
+ if (SinataUtil.isNotEmpty(createTime)) {
String[] timeArray = createTime.split(" - ");
beginTime = timeArray[0];
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(userCouponRecordService.getBlanceList(page,beginTime,endTime,activityId));
+ page.setRecords(userCouponRecordService.getBlanceList(page, beginTime, endTime, activityId));
return super.packForBT(page);
}
/**
@@ -289,7 +290,7 @@
startTimes = DateUtil.getDate_str3(timeArray[0]+" 00:00:00");
endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
}
- Integer uid = ShiroExtUtil.getUser().getId();
+ Integer uid = shiroExtUtil.getUser().getId();
return userActivityService.queryUserActivityList(uid, startTimes, endTimes, name, status, offset, limit);
}
--
Gitblit v1.7.1