diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizTeamRewardController.java b/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizTeamRewardController.java index 635c4b532..f41a10dd2 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizTeamRewardController.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizTeamRewardController.java @@ -1,6 +1,8 @@ package com.ruoyi.business.controller; import java.util.List; + +import com.ruoyi.common.utils.DateUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -19,6 +21,8 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; +import javax.annotation.Resource; + /** * 团队奖励明细Controller * @@ -31,20 +35,24 @@ public class BizTeamRewardController extends BaseController { private String prefix = "business/reward"; - @Autowired + @Resource private IBizTeamRewardService bizTeamRewardService; - @RequiresPermissions("business:reward:view") + @RequiresPermissions("business:member:view") @GetMapping() - public String reward() + public String reward(Long memberID, String rewardDate, ModelMap mmap) { + mmap.put("memberID", memberID); + //检索当前一天结算 + mmap.put("rewardDate", DateUtils.getDate(-1, rewardDate)); + mmap.put("rewardType", BizTeamReward.TEAM_REWARD_TYPE_TEAM); return prefix + "/reward"; } /** * 查询团队奖励明细列表 */ - @RequiresPermissions("business:reward:list") + @RequiresPermissions("business:member:view") @PostMapping("/list") @ResponseBody public TableDataInfo list(BizTeamReward bizTeamReward) @@ -54,73 +62,4 @@ public class BizTeamRewardController extends BaseController return getDataTable(list); } - /** - * 导出团队奖励明细列表 - */ - @RequiresPermissions("business:reward:export") - @Log(title = "团队奖励明细", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(BizTeamReward bizTeamReward) - { - List list = bizTeamRewardService.selectBizTeamRewardList(bizTeamReward); - ExcelUtil util = new ExcelUtil(BizTeamReward.class); - return util.exportExcel(list, "reward"); - } - - /** - * 新增团队奖励明细 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存团队奖励明细 - */ - @RequiresPermissions("business:reward:add") - @Log(title = "团队奖励明细", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(BizTeamReward bizTeamReward) - { - return toAjax(bizTeamRewardService.insertBizTeamReward(bizTeamReward)); - } - - /** - * 修改团队奖励明细 - */ - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") Long id, ModelMap mmap) - { - BizTeamReward bizTeamReward = bizTeamRewardService.selectBizTeamRewardById(id); - mmap.put("bizTeamReward", bizTeamReward); - return prefix + "/edit"; - } - - /** - * 修改保存团队奖励明细 - */ - @RequiresPermissions("business:reward:edit") - @Log(title = "团队奖励明细", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(BizTeamReward bizTeamReward) - { - return toAjax(bizTeamRewardService.updateBizTeamReward(bizTeamReward)); - } - - /** - * 删除团队奖励明细 - */ - @RequiresPermissions("business:reward:remove") - @Log(title = "团队奖励明细", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(bizTeamRewardService.deleteBizTeamRewardByIds(ids)); - } } diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizTeamReward.java b/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizTeamReward.java index f3a5a8b5c..b8654d447 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizTeamReward.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizTeamReward.java @@ -32,6 +32,10 @@ public class BizTeamReward extends BaseEntity @Excel(name = "团队用户ID") private Long rewardMemberId; + /** 团队用户名称 */ + @Excel(name = "团队用户名称") + private String rewardMemberName; + /** 用户购买产品数量 */ @Excel(name = "用户购买产品数量") private Long rewardProductCount; @@ -70,7 +74,16 @@ public class BizTeamReward extends BaseEntity { return memberId; } - public void setRewardMemberId(Long rewardMemberId) + + public String getRewardMemberName() { + return rewardMemberName; + } + + public void setRewardMemberName(String rewardMemberName) { + this.rewardMemberName = rewardMemberName; + } + + public void setRewardMemberId(Long rewardMemberId) { this.rewardMemberId = rewardMemberId; } diff --git a/ruoyi-business/src/main/resources/mapper/business/BizTeamRewardMapper.xml b/ruoyi-business/src/main/resources/mapper/business/BizTeamRewardMapper.xml index 26366aec4..45be298e8 100644 --- a/ruoyi-business/src/main/resources/mapper/business/BizTeamRewardMapper.xml +++ b/ruoyi-business/src/main/resources/mapper/business/BizTeamRewardMapper.xml @@ -20,16 +20,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, member_id, reward_member_id, reward_product_count, reward_amount, product_id, reward_type, reward_date, create_by, create_time, update_by, update_time from biz_team_reward + select a.id, a.member_id, reward_member_id, (concat(b.member_name, b.mobile)) rewardMemberName, reward_product_count, reward_amount, product_id, reward_type, reward_date, a.create_by, a.create_time, a.update_by, a.update_time from biz_team_reward a + left join biz_member b on a.reward_member_id = b.id + + + + + + + +
+
+
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java index 1c2ee9d6e..41ca603e8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java @@ -56,9 +56,16 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils * * @return String */ - public static String getDate(int diff) + public static String getDate(int diff, String ... dateStr) { Calendar now = Calendar.getInstance(); + if (dateStr.length > 0) { + try { + now.setTime(parseDate(dateStr[0], YYYY_MM_DD)); + } catch (Exception ex) { + ex.printStackTrace(); + } + } now.add(Calendar.DAY_OF_MONTH, diff); return dateTime(now.getTime()); }