| | |
|---|
| | | 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.log.LogObjectHolder; |
|---|
| | | import com.stylefeng.guns.core.shiro.ShiroKit; |
|---|
| | |
|---|
| | | @ResponseBody |
|---|
| | | public Object list(String startTime, String endTime, Integer type, String merchantName, Integer status) { |
|---|
| | | |
|---|
| | | Integer companyId = ShiroKit.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); |
|---|
| | |
|---|
| | | @RequestMapping("/add") |
|---|
| | | public Object add(@RequestBody MerchantActivity activity) { |
|---|
| | | |
|---|
| | | Integer userId = ShiroKit.getUser().getId(); |
|---|
| | | Integer userId = ShiroExtUtil.getUser().getId(); |
|---|
| | | User user = userService.selectById(userId); |
|---|
| | | if (ToolUtil.isNotEmpty(user)) { |
|---|
| | | if (user.getRoleType().equals(2)) { |
|---|
