|
@@ -1,6 +1,7 @@
|
|
|
package com.ym.mec.student.controller;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
|
import com.ym.mec.biz.dal.dao.StudentDao;
|
|
|
import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
|
|
@@ -109,7 +110,7 @@ public class ActivityController extends BaseController {
|
|
|
return succeed(resultMap);
|
|
|
}
|
|
|
|
|
|
- @ApiOperation("获取2022云教练活动列表")
|
|
|
+/* @ApiOperation("获取2022云教练活动列表")
|
|
|
@PostMapping(value = "/queryActivity")
|
|
|
@AuditLogAnnotation(operateName = "获取2022云教练活动列表")
|
|
|
public HttpResponseResult<List<VipGroupActivity>> queryActivity(){
|
|
@@ -117,6 +118,24 @@ public class ActivityController extends BaseController {
|
|
|
List<Cloud2022ActivityDto> cloud2022ActivityDtos = JSONArray.parseArray(configValue, Cloud2022ActivityDto.class);
|
|
|
String collect = cloud2022ActivityDtos.stream().map(e -> e.getActivityId()).collect(Collectors.joining(","));
|
|
|
return succeed(vipGroupActivityService.getDao().queryByIds(collect));
|
|
|
+ }*/
|
|
|
+
|
|
|
+ @ApiOperation("获取2023乐理直播活动列表")
|
|
|
+ @PostMapping(value = "/queryTheoryLiveActivity")
|
|
|
+ @AuditLogAnnotation(operateName = "获取2023乐理直播活动列表")
|
|
|
+ public HttpResponseResult<List<VipGroupActivity>> queryTheoryLiveActivity(){
|
|
|
+ String configValue = sysConfigDao.findConfigValue("2023_double_eleven_active_config");
|
|
|
+ JSONObject jsonObject = JSONObject.parseObject(configValue);
|
|
|
+ String theoryLive = jsonObject.getString("theoryLive");
|
|
|
+ return succeed(vipGroupActivityService.getDao().queryByIds(theoryLive));
|
|
|
+ }
|
|
|
+ @ApiOperation("获取2023商品列表")
|
|
|
+ @PostMapping(value = "/queryGoodsActivity")
|
|
|
+ @AuditLogAnnotation(operateName = "获取2023商品列表")
|
|
|
+ public HttpResponseResult<JSONObject> queryGoodsActivity(){
|
|
|
+ String configValue = sysConfigDao.findConfigValue("2023_double_eleven_active_config");
|
|
|
+ JSONObject jsonObject = JSONObject.parseObject(configValue);
|
|
|
+ return succeed(jsonObject.getJSONObject("musical"));
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "学员已购买的双十一活动信息")
|