代码更新

member.impl/src/main/java/com/apobates/forum/member/impl/service/MemberPenalizeRecordsServiceImpl.java

@@ -34,16 +34,14 @@ public class MemberPenalizeRecordsServiceImpl implements MemberPenalizeRecordsSe
     @Override
     public Optional<Boolean> expired(long id)throws IllegalArgumentException,IllegalStateException {
         MemberPenalizeRecords obj = get(id).orElseThrow(()->new IllegalArgumentException("会员惩罚记录不存在"));
-        //是否正处于惩罚期
-        boolean isDoing = DateTimeUtils.isFeatureDate(obj.getRebirthDateTime());
-        if (isDoing) {
+        //
+        if (DateTimeUtils.isFeatureDate(obj.getRebirthDateTime())) {
             throw new IllegalStateException("会员惩罚进行中,不可以作废");
         }
         Optional<Boolean> result = memberPenalizeRecordsDao.expired(obj.getId());
-        //编辑成功 && 惩罚进行时(会员的状态变了)
-        if (result.isPresent() && obj.isStatus()) {
-            memberDao.editMemberStatus(obj.getMemberId(), obj.getOriginal());
-        }
+        result.ifPresent(bol-> {
+            if(bol){memberDao.editMemberStatus(obj.getMemberId(), obj.getOriginal());}
+        });
         return result;
     }
     

member.impl/src/main/java/com/apobates/forum/member/impl/service/MemberVipExchangeRecordsServiceImpl.java

@@ -53,16 +53,14 @@ public class MemberVipExchangeRecordsServiceImpl implements MemberVipExchangeRec
     @Override
     public Optional<Boolean> expired(long id) throws IllegalArgumentException, IllegalStateException {
         MemberVipExchangeRecords obj = memberVipExchangeRecordsDao.findOne(id).orElseThrow(()->new IllegalArgumentException("VIP交易记录不存在"));
-        //是否正处于惩罚期
-        boolean isDoing = DateTimeUtils.isFeatureDate(obj.getLapseDateTime());
-        if (isDoing) {
+        //
+        if (DateTimeUtils.isFeatureDate(obj.getLapseDateTime())) {
             throw new IllegalStateException("VIP会员未到期,不可以作废");
         }
         Optional<Boolean> result = memberVipExchangeRecordsDao.expired(obj.getId());
-        //编辑成功 && 惩罚进行时(会员的状态变了)
-        if (result.isPresent() && obj.isStatus()) {
-            memberDao.editMemberGroup(obj.getMemberId(), MemberGroupEnum.CARD);
-        }
+        result.ifPresent(bol-> {
+            if(bol){ memberDao.editMemberGroup(obj.getMemberId(), MemberGroupEnum.CARD);}
+        });
         return result;
     }
 }
\ No newline at end of file

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberPenalizeRecordsController.java

@@ -102,8 +102,7 @@ public class AdminMemberPenalizeRecordsController {
                 mbean.getNickname());
         String errMsg = "新增惩罚记录操作失败";
         try {
-            long id = memberPenalizeRecordsService.create(mpr);
-            if (id > 0) {
+            if (memberPenalizeRecordsService.create(mpr) > 0) {
                 return "redirect:/member/penalize/";
             }
         } catch (Exception e) {
@@ -119,7 +118,6 @@ public class AdminMemberPenalizeRecordsController {
     @ResponseBody
     public TipMessage removePenalizeAction(
             @RequestParam("id") long id,
-            MemberSessionBean mbean,
             HttpServletRequest request,
             Model model) {
         try{

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberVipExchangeRecordsController.java

@@ -68,7 +68,6 @@ public class AdminMemberVipExchangeRecordsController {
     @PostMapping(path = "/create")
     public String createAction(
             HttpServletRequest request,
-            MemberSessionBean mbean,
             @Valid @ModelAttribute("form") MemberExchangeForm form,
             BindingResult bindingResult,
             Model model) {
@@ -79,8 +78,7 @@ public class AdminMemberVipExchangeRecordsController {
         Member m = memberService.get(form.getMemberId()).orElseThrow(()->new ResourceNotFoundException("会员不存在或暂时无法访问"));
         String errMsg = "创建VIP交易记录操作失败";
         try {
-            boolean symbol = memberService.exchangeVIP(m.getId(), form.getIntegerLimit(), form.getEnumUnit(), form.getSerial()).orElse(false);
-            if (symbol) {
+            if (memberService.exchangeVIP(m.getId(), form.getIntegerLimit(), form.getEnumUnit(), form.getSerial()).orElse(false)) {
                 return "redirect:/member/exchange/";
             }
         } catch (Exception e) {