diff --git a/src/main/java/edu/situ/stlserver/controller/MemberController.java b/src/main/java/edu/situ/stlserver/controller/MemberController.java index ee84ea3..4412756 100644 --- a/src/main/java/edu/situ/stlserver/controller/MemberController.java +++ b/src/main/java/edu/situ/stlserver/controller/MemberController.java @@ -33,8 +33,8 @@ public class MemberController { } @PutMapping("/{id}/renew") - public HttpResult renew(@PathVariable Integer id) { - memberService.renew(id); + public HttpResult renew(@PathVariable Integer id, @RequestParam(defaultValue = "365") Integer days) { + memberService.renew(id, days); return HttpResult.success(); } diff --git a/src/main/java/edu/situ/stlserver/dao/MemberMapper.java b/src/main/java/edu/situ/stlserver/dao/MemberMapper.java index 1a9850d..9e1a268 100644 --- a/src/main/java/edu/situ/stlserver/dao/MemberMapper.java +++ b/src/main/java/edu/situ/stlserver/dao/MemberMapper.java @@ -35,8 +35,8 @@ public interface MemberMapper { @Update(value = "UPDATE `members` SET `end_date` = #{endDate} WHERE `id` = #{id}") void cancel(@Param("id") Integer id, @Param("endDate") String endDate); - @Update(value = "UPDATE `members` SET `end_date` = DATE_ADD(COALESCE(end_date, CURDATE()), INTERVAL 365 DAY) WHERE `id` = #{id}") - void renew(Integer id); + @Update(value = "UPDATE `members` SET `end_date` = DATE_ADD(COALESCE(end_date, CURDATE()), INTERVAL #{days} DAY) WHERE `id` = #{id}") + void renew(@Param("id") Integer id, @Param("days") Integer days); @Delete(value = "DELETE FROM `members` WHERE `id` = #{id}") void delete(Integer id); diff --git a/src/main/java/edu/situ/stlserver/service/MemberService.java b/src/main/java/edu/situ/stlserver/service/MemberService.java index a02057f..f16dadf 100644 --- a/src/main/java/edu/situ/stlserver/service/MemberService.java +++ b/src/main/java/edu/situ/stlserver/service/MemberService.java @@ -12,7 +12,7 @@ public interface MemberService { List getAll(); PageInfo getByPage(Integer page, Integer limit, MemberQueryDTO memberQueryDTO); void cancel(Integer id); - void renew(Integer id); + void renew(Integer id, Integer days); void delete(Integer id); void add(MemberAddDTO memberAddDTO); Member getById(Integer id); diff --git a/src/main/java/edu/situ/stlserver/service/impl/MemberServiceImpl.java b/src/main/java/edu/situ/stlserver/service/impl/MemberServiceImpl.java index c2f68bc..7892e84 100644 --- a/src/main/java/edu/situ/stlserver/service/impl/MemberServiceImpl.java +++ b/src/main/java/edu/situ/stlserver/service/impl/MemberServiceImpl.java @@ -48,8 +48,8 @@ public class MemberServiceImpl implements MemberService { } @Override - public void renew(Integer id) { - memberMapper.renew(id); + public void renew(Integer id, Integer days) { + memberMapper.renew(id, days); } @Override