From 49e88798dcea0164f77c59f0be9eefdf67a3d228 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 17 七月 2024 15:03:10 +0800 Subject: [PATCH] 2.0bug修改 --- ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java index 4e7f6a5..f1a1590 100644 --- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java +++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java @@ -48,6 +48,14 @@ private IUserRedPacketRecordService userRedPacketRecordService; + @RequestMapping("/redRecord") + public String index( Model model,Integer couponActivityId,Integer activityType) { + model.addAttribute("activityType",activityType); + model.addAttribute("couponActivityId",couponActivityId); + return PREFIX + "userRedRecord.html"; + } + + /** * 跳转到首页 */ @@ -121,6 +129,22 @@ } return ResultUtil.success(); } + + @RequestMapping(value = "/user/list") + @ResponseBody + public Object list(String createTime,String userName,String userPhone,Integer couponActivityId,Integer activityType,Integer state) { + String beginTime = null; + String endTime = null; + 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(sysRedPacketRecordService.getList(page,beginTime,endTime,userName,userPhone,couponActivityId,activityType,state)); + return super.packForBT(page); + } + /** * 获取列表 */ -- Gitblit v1.7.1