diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/memberCenter/MemberController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/memberCenter/MemberController.java index 7461ec9..d0612c7 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/memberCenter/MemberController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/memberCenter/MemberController.java @@ -66,17 +66,17 @@ public class MemberController { SysUser sysUser = sysUserService.selectUserById(userId); if (!Optional.ofNullable(sysUser).isPresent()) { - return R.fail(HttpStatus.SHOW_ERROR_MSG,"用户不存在"); + return R.fail(HttpStatus.SHOW_ERROR_MSG, "用户不存在"); } MemberLevel memberLevel = memberLevelService.getById(memberLevelId); if (!Optional.ofNullable(memberLevel).isPresent()) { - return R.fail(HttpStatus.SHOW_ERROR_MSG,"会员等级不存在"); + return R.fail(HttpStatus.SHOW_ERROR_MSG, "会员等级不存在"); } Member member = memberService.createUserMember(userId, memberLevelId, paymentMethod, promotionId); if (!Optional.ofNullable(member).isPresent()) { - return R.fail(HttpStatus.SHOW_ERROR_MSG,"创建会员失败"); + return R.fail(HttpStatus.SHOW_ERROR_MSG, "创建会员失败"); } return R.ok(member); @@ -94,7 +94,6 @@ public class MemberController { } - /** * 获取积分消费记录 * @@ -129,14 +128,14 @@ public class MemberController { SysUser sysUser = sysUserService.selectUserById(userId); if (!Optional.ofNullable(sysUser).isPresent()) { - return R.fail(HttpStatus.SHOW_ERROR_MSG,"用户不存在"); + return R.fail(HttpStatus.SHOW_ERROR_MSG, "用户不存在"); } Member member = memberService.rechargePoints(userId, amount * 100); // 返回充值积分 if (!Optional.ofNullable(member).isPresent()) { - return R.fail(HttpStatus.SHOW_ERROR_MSG,"充值积分失败"); + return R.fail(HttpStatus.SHOW_ERROR_MSG, "充值积分失败"); } return R.ok(); @@ -151,7 +150,7 @@ public class MemberController { public R consumePoints(@PathVariable Double consumePoints) { if (consumePoints == null || consumePoints <= 0) { - return R.fail(HttpStatus.SHOW_ERROR_MSG,"消费积分不能为空或小于0"); + return R.fail(HttpStatus.SHOW_ERROR_MSG, "消费积分不能为空或小于0"); } memberService.consumePoints(consumePoints); @@ -175,9 +174,9 @@ public class MemberController { .eq(MemberPromotion::getStatus, PromotionEnum.PARTICIPATE) .one(); -// if (Objects.isNull(memberPromotion)) { -// return AjaxResult.warn("未参与活动或已过期"); -// } + if (Objects.isNull(memberPromotion)) { + return R.fail(HttpStatus.SHOW_ERROR_MSG, "未参与活动或已过期"); + } MemberLevel memberLevel = memberLevelService.getById(memberLevelId); Double unitPrice = memberLevel.getUnitPrice(); @@ -195,7 +194,7 @@ public class MemberController { Map map = new HashMap<>(); Member member = memberService.getUseUserMemberByUserId(userId); if (Optional.ofNullable(member).isPresent()) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Date startDate = member.getStartDate(); Date endDate = member.getEndDate(); map.put("result", "1");