From f0a32f149460a2de3c00b3f05e85b486ba208b46 Mon Sep 17 00:00:00 2001 From: PQZ Date: Tue, 22 Apr 2025 10:17:15 +0800 Subject: [PATCH] 1 --- .../controller/MemberRightsController.java | 52 +++++++++++++------ .../member/service/IMemberRightsService.java | 9 ++++ .../service/impl/MemberRightsServiceImpl.java | 18 +++++++ 3 files changed, 63 insertions(+), 16 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberRightsController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberRightsController.java index bd5f77c..a9a2916 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberRightsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberRightsController.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletResponse; + import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -25,24 +26,48 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 会员权益(定时任务重置剩余值)，用户id、会员卡id、权益对应1Controller - * + * * @author pqz * @date 2025-03-17 */ @RestController @RequestMapping("/rights/rights") -public class MemberRightsController extends BaseController -{ +public class MemberRightsController extends BaseController { @Autowired private IMemberRightsService memberRightsService; + /** + * 定时任务重置剩余值（每天） + * @author PQZ + * @date 10:07 2025/4/22 + * @return com.ruoyi.common.core.domain.AjaxResult + **/ + @GetMapping("/resetDay") + public AjaxResult resetDay() { + memberRightsService.reset("day"); + return success(); + } + + /** + * 定时任务重置剩余值（每月） + * @author PQZ + * @date 10:09 2025/4/22 + * @return com.ruoyi.common.core.domain.AjaxResult + **/ + @GetMapping("/resetMonth") + public AjaxResult resetMonth() { + memberRightsService.reset("month"); + return success(); + } + + + /** * 查询会员权益(定时任务重置剩余值)，用户id、会员卡id、权益对应1列表 */ @PreAuthorize("@ss.hasPermi('rights:rights:list')") @GetMapping("/list") - public AjaxResult list(MemberRights memberRights) - { + public AjaxResult list(MemberRights memberRights) { List list = memberRightsService.list(); return success(list); @@ -54,8 +79,7 @@ public class MemberRightsController extends BaseController @PreAuthorize("@ss.hasPermi('rights:rights:export')") @Log(title = "会员权益(定时任务重置剩余值)，用户id、会员卡id、权益对应1", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, MemberRights memberRights) - { + public void export(HttpServletResponse response, MemberRights memberRights) { List list = memberRightsService.list(); ExcelUtil util = new ExcelUtil(MemberRights.class); util.exportExcel(response, list, "会员权益(定时任务重置剩余值)，用户id、会员卡id、权益对应1数据"); @@ -66,8 +90,7 @@ public class MemberRightsController extends BaseController */ @PreAuthorize("@ss.hasPermi('rights:rights:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") String id) - { + public AjaxResult getInfo(@PathVariable("id") String id) { return success(memberRightsService.getById(id)); } @@ -77,8 +100,7 @@ public class MemberRightsController extends BaseController @PreAuthorize("@ss.hasPermi('rights:rights:add')") @Log(title = "会员权益(定时任务重置剩余值)，用户id、会员卡id、权益对应1", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody MemberRights memberRights) - { + public AjaxResult add(@RequestBody MemberRights memberRights) { return toAjax(memberRightsService.save(memberRights)); } @@ -88,8 +110,7 @@ public class MemberRightsController extends BaseController @PreAuthorize("@ss.hasPermi('rights:rights:edit')") @Log(title = "会员权益(定时任务重置剩余值)，用户id、会员卡id、权益对应1", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody MemberRights memberRights) - { + public AjaxResult edit(@RequestBody MemberRights memberRights) { return toAjax(memberRightsService.updateById(memberRights)); } @@ -98,9 +119,8 @@ public class MemberRightsController extends BaseController */ @PreAuthorize("@ss.hasPermi('rights:rights:remove')") @Log(title = "会员权益(定时任务重置剩余值)，用户id、会员卡id、权益对应1", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable String[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { List list = new ArrayList<>(Arrays.asList(ids)); return toAjax(memberRightsService.removeByIds(list)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberRightsService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberRightsService.java index da051ad..56339cf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberRightsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberRightsService.java @@ -45,4 +45,13 @@ public interface IMemberRightsService extends IService { * @date 14:32 2025/4/17 **/ void dealMemberRights(Long userId, List memberCards, String rightsCode, Integer deplete) throws Exception; + + /** + * 定时任务重置剩余值 + * @author PQZ + * @date 10:10 2025/4/22 + **/ + void reset(String rightsCycle); + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberRightsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberRightsServiceImpl.java index c7af143..025933b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberRightsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberRightsServiceImpl.java @@ -114,4 +114,22 @@ public class MemberRightsServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(MemberRights::getRightsCycle,rightsCycle); + List list = list(lambdaQueryWrapper); + list.forEach(item -> { + item.setRemaining(item.getRightsValue()); + }); + updateBatchById(list); + } + }