黔云通
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
Pu Zhibing
2 天以前 5dacdee9b54c78372b68140e2b068d03a620eab9 
 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;


@@ -69,9 +67,12 @@




    @Autowired


    private ITUserRedPacketRecordService redPacketRecordService;


    @Resource


    private ShiroExtUtil shiroExtUtil;




    /**


     * 跳转领取统计


     *


     * @return


     */


    @RequestMapping("/receiveRecord")


@@ -264,7 +265,7 @@


    @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)){


@@ -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);


    }