小小训练营

mec-biz/src/main/java/com/ym/mec/biz/service/MemberRankSettingService.java

@@ -38,5 +38,5 @@ public interface MemberRankSettingService extends BaseService<Integer, MemberRan
 
     HttpResponseResult activeBuy(MemberPayParamDto memberPayParamDto) throws Exception;
 
-    HttpResponseResult checkActiveBuy(MemberPayParamDto memberPayParamDto);
+    HttpResponseResult<Integer> checkActiveBuy(MemberPayParamDto memberPayParamDto);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MemberRankSettingServiceImpl.java

@@ -309,16 +309,18 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
     }
 
     @Override
-    public HttpResponseResult checkActiveBuy(MemberPayParamDto memberPayParamDto) {
+    public HttpResponseResult<Integer> checkActiveBuy(MemberPayParamDto memberPayParamDto) {
         SysUser sysUser = Optional.of(sysUserFeignService.queryUserInfo()).orElseThrow(()-> new BizException("请登录"));
         //判断当前商品是否可以购买（库存、上架状态、是否购买过）
         //如果是云教练商品，那么只能购买一次、如果是免费直播课，那么每次上架只能买一次，总共只能买2次
+        HttpResponseResult<Integer> succeed = BaseController.succeed(0);
         if(memberPayParamDto.getLiveGoodsId() == 1){
             String activeConfig = sysConfigDao.findConfigValue("cloud_teacher_active_config");
             List<Cloud2022ActivityDto> cloud2022ActivityDtos = JSONArray.parseArray(activeConfig, Cloud2022ActivityDto.class);
             List<Cloud2022ActivityDto> activityDtos = cloud2022ActivityDtos.stream().filter(e -> e.getOrganId().contains(sysUser.getOrganId().toString())).collect(Collectors.toList());
             if(CollectionUtils.isEmpty(activityDtos)){
-                return BaseController.failed("当前分部暂未开通活动");
+                succeed.setMsg("当前分部暂未开通活动");
+                return succeed;
             }
             //是否还有购买资格
             Integer activityId = Integer.parseInt(activityDtos.get(0).getActivityId());
@@ -327,7 +329,8 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 //获取活动购买次数
                 int activityBuyNum = activityUserMapperDao.countActivityBuyNum(vipGroupActivity.getId(),sysUser.getId());
                 if(activityBuyNum >= vipGroupActivity.getStudentMaxUsedTimes()){
-                    return BaseController.failed("您已达到购买次数上限");
+                    succeed.setMsg("您已达到购买次数上限");
+                    return succeed;
                 }
             }
         } else if (memberPayParamDto.getLiveGoodsId() == 2){
@@ -338,17 +341,20 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
             }
             //当前用户是否购买过免费直播课
             if(list.contains(sysUser.getId())){
-                return BaseController.failed("您已购买过本轮免费直播课");
+                succeed.setMsg("您已购买过本轮免费直播课");
+                return succeed;
             }
             //购买次数是否超过2次
             int count = tempBuyFreeLiveTheoryCourseDao.countByUserId(sysUser.getId());
             if(count >= 2){
-                return BaseController.failed("免费直播课已达到购买次数上限");
+                succeed.setMsg("免费直播课已达到购买次数上限");
+                return succeed;
             }
         }else {
-            return BaseController.failed("当前商品不可购买");
+            succeed.setMsg("当前商品不可购买");
+            return succeed;
         }
-        return BaseController.succeed();
+        return BaseController.succeed(1);
     }
 
     public static final String BUY_2_QQHE_LOCK = "BUY_2_QQHE_LOCK:";

mec-student/src/main/java/com/ym/mec/student/controller/MemberRankController.java

@@ -119,7 +119,7 @@ public class MemberRankController extends BaseController {
 
     @ApiOperation(value = "2022小小训练营活动购买会员")
     @PostMapping("/checkActiveBuy")
-    public HttpResponseResult checkActiveBuy(@RequestBody MemberPayParamDto memberPayParamDto) throws Exception {
+    public HttpResponseResult<Integer> checkActiveBuy(@RequestBody MemberPayParamDto memberPayParamDto) throws Exception {
 		return memberRankSettingService.checkActiveBuy(memberPayParamDto);
     }