|
|
@@ -16,8 +16,6 @@ import com.ym.mec.biz.service.MarketActivityService;
|
|
|
import com.ym.mec.biz.service.SporadicChargeInfoService;
|
|
|
import com.ym.mec.common.controller.BaseController;
|
|
|
import com.ym.mec.common.entity.HttpResponseResult;
|
|
|
-import com.ym.mec.common.exception.BizException;
|
|
|
-import com.ym.mec.util.date.DateUtil;
|
|
|
import com.yonge.log.model.AuditLogAnnotation;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
@@ -109,46 +107,11 @@ public class ActivityController extends BaseController {
|
|
|
@ApiOperation("获取2022云教练活动列表")
|
|
|
@PostMapping(value = "/queryActivity")
|
|
|
@AuditLogAnnotation(operateName = "获取2022云教练活动列表")
|
|
|
- public HttpResponseResult<List<VipGroupActivity>> queryActivity() throws Exception {
|
|
|
- return failed("购买入口已关闭，请联系管理员");
|
|
|
-// SysUser user = sysUserFeignService.queryUserInfo();
|
|
|
-// if (user == null) {
|
|
|
-// return failed(HttpStatus.FORBIDDEN, "请登录");
|
|
|
-// }
|
|
|
-// Date nowTime = new Date();
|
|
|
-// String startTimeStr = sysConfigDao.findConfigValue("2022_cloud_activity_start_time");
|
|
|
-// Date startTime = DateUtil.stringToDate(startTimeStr);
|
|
|
-// if (startTime.compareTo(nowTime) > 0) {
|
|
|
-// throw new BizException("活动还未开始，谢谢关注");
|
|
|
-// }
|
|
|
-// String endTimeStr = sysConfigDao.findConfigValue("2022_cloud_activity_end_time");
|
|
|
-// Date endTime = DateUtil.stringToDate(endTimeStr);
|
|
|
-// if (endTime.compareTo(nowTime) <= 0) {
|
|
|
-// throw new BizException("活动已结束，谢谢关注");
|
|
|
-// }
|
|
|
-// String configValue = sysConfigDao.findConfigValue("2022_cloud_activity_config");
|
|
|
-// List<Cloud2022ActivityDto> cloud2022ActivityDtos = JSONArray.parseArray(configValue, Cloud2022ActivityDto.class);
|
|
|
-// for (Cloud2022ActivityDto cloud2022ActivityDto : cloud2022ActivityDtos) {
|
|
|
-// String[] split = cloud2022ActivityDto.getOrganId().split(",");
|
|
|
-// long count = Arrays.stream(split).filter(e -> Objects.equals(e, user.getOrganId().toString())).count();
|
|
|
-// if(count > 0l){
|
|
|
-// List<VipGroupActivity> vipGroupActivities = vipGroupActivityDao.queryByIds(cloud2022ActivityDto.getActivityId());
|
|
|
-// for (VipGroupActivity vipGroupActivity : vipGroupActivities) {
|
|
|
-// Integer studentMaxUsedTimes = vipGroupActivity.getStudentMaxUsedTimes();
|
|
|
-// if (studentMaxUsedTimes != -1) {
|
|
|
-// //获取活动购买次数
|
|
|
-// int activityBuyNum = activityUserMapperService.countActivityBuyNum(vipGroupActivity.getId(),user.getId());
|
|
|
-// //查看学员是否还可以购买活动
|
|
|
-// vipGroupActivity.setEnable(true);
|
|
|
-// if (activityBuyNum >= studentMaxUsedTimes) {
|
|
|
-// vipGroupActivity.setEnable(false);
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
-// return succeed(vipGroupActivities.stream().sorted(Comparator.comparing(VipGroupActivity::getMarketPrice)).collect(Collectors.toList()));
|
|
|
-// }
|
|
|
-// }
|
|
|
-// return failed("当前分部不参与此活动，请联系管理员");
|
|
|
+ public HttpResponseResult<List<VipGroupActivity>> queryActivity(){
|
|
|
+ String configValue = sysConfigDao.findConfigValue("2022_cloud_activity_config");
|
|
|
+ List<Cloud2022ActivityDto> cloud2022ActivityDtos = JSONArray.parseArray(configValue, Cloud2022ActivityDto.class);
|
|
|
+ String collect = cloud2022ActivityDtos.stream().map(e -> e.getActivityId()).collect(Collectors.joining(","));
|
|
|
+ return succeed(vipGroupActivityDao.queryByIds(collect));
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "学员已购买的双十一活动信息")
|
zouxuan