|
@@ -246,17 +246,17 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
|
//还原库存
|
|
|
liveGoodsService.addGoodsStock(memberPayParamDto.getLiveGoodsId(),memberPayParamDto.getLiveId());
|
|
|
}
|
|
|
+ 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)){
|
|
|
+ throw new BizException("当前分部暂未开通活动");
|
|
|
+ }
|
|
|
BigDecimal amount = BigDecimal.ZERO;
|
|
|
Integer activityId = null;
|
|
|
//判断当前商品是否可以购买(库存、上架状态、是否购买过)
|
|
|
//如果是云教练商品,那么只能购买一次、如果是免费直播课,那么每次上架只能买一次,总共只能买2次
|
|
|
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)){
|
|
|
- throw new BizException("当前分部暂未开通活动");
|
|
|
- }
|
|
|
//是否还有购买资格
|
|
|
activityId = Integer.parseInt(activityDtos.get(0).getActivityId());
|
|
|
VipGroupActivity vipGroupActivity = Optional.ofNullable(vipGroupActivityDao.get(activityId)).orElseThrow(()-> new BizException("活动不存在"));
|
|
@@ -315,14 +315,14 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
|
//判断当前商品是否可以购买(库存、上架状态、是否购买过)
|
|
|
//如果是云教练商品,那么只能购买一次、如果是免费直播课,那么每次上架只能买一次,总共只能买2次
|
|
|
HttpResponseResult<Integer> succeed = BaseController.succeed(0);
|
|
|
+ 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)){
|
|
|
+ succeed.setMsg("当前分部暂未开通活动");
|
|
|
+ return succeed;
|
|
|
+ }
|
|
|
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)){
|
|
|
- succeed.setMsg("当前分部暂未开通活动");
|
|
|
- return succeed;
|
|
|
- }
|
|
|
//是否还有购买资格
|
|
|
Integer activityId = Integer.parseInt(activityDtos.get(0).getActivityId());
|
|
|
VipGroupActivity vipGroupActivity = Optional.ofNullable(vipGroupActivityDao.get(activityId)).orElseThrow(()-> new BizException("活动不存在"));
|