Compare commits

..

No commits in common. "4e1f18c0ffe90098ce820bc745b7b44bcb54052a" and "b265ff9c3dbcee12196985c17cda59191e2fd348" have entirely different histories.

3 changed files with 16 additions and 63 deletions

View File

@ -4,7 +4,6 @@ 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;
@ -32,42 +31,18 @@ import com.ruoyi.common.core.page.TableDataInfo;
*/
@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<MemberRights> list = memberRightsService.list();
return success(list);
@ -79,7 +54,8 @@ 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<MemberRights> list = memberRightsService.list();
ExcelUtil<MemberRights> util = new ExcelUtil<MemberRights>(MemberRights.class);
util.exportExcel(response, list, "会员权益(定时任务重置剩余值)用户id、会员卡id、权益对应1数据");
@ -90,7 +66,8 @@ 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));
}
@ -100,7 +77,8 @@ 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));
}
@ -110,7 +88,8 @@ 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));
}
@ -119,8 +98,9 @@ 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<String> list = new ArrayList<>(Arrays.asList(ids));
return toAjax(memberRightsService.removeByIds(list));
}

View File

@ -45,13 +45,4 @@ public interface IMemberRightsService extends IService<MemberRights> {
* @date 14:32 2025/4/17
**/
void dealMemberRights(Long userId, List<MemberCard> memberCards, String rightsCode, Integer deplete) throws Exception;
/**
* 定时任务重置剩余值
* @author PQZ
* @date 10:10 2025/4/22
**/
void reset(String rightsCycle);
}

View File

@ -114,22 +114,4 @@ public class MemberRightsServiceImpl extends ServiceImpl<MemberRightsMapper, Mem
}
}
/**
* 定时任务重置剩余值
*
* @author PQZ
* @date 10:10 2025/4/22
**/
@Override
public void reset(String rightsCycle) {
LambdaQueryWrapper<MemberRights> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(MemberRights::getRightsCycle,rightsCycle);
List<MemberRights> list = list(lambdaQueryWrapper);
list.forEach(item -> {
item.setRemaining(item.getRightsValue());
});
updateBatchById(list);
}
}