Merge remote-tracking branch 'origin/zx_1026_1111' into zx_1026_1111

mec-application/src/main/java/com/ym/mec/student/controller/ActivityController.java

@@ -3,15 +3,9 @@ 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;
-import com.ym.mec.biz.dal.dao.SysConfigDao;
-import com.ym.mec.biz.dal.dao.VipGroupCategoryDao;
+import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.dal.entity.ActivityDetailDto;
-import com.ym.mec.biz.dal.entity.SporadicChargeInfo;
-import com.ym.mec.biz.dal.entity.Student;
-import com.ym.mec.biz.dal.entity.VipGroupActivity;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.service.MarketActivityService;
 import com.ym.mec.biz.service.SporadicChargeInfoService;
 import com.ym.mec.biz.service.SysUserService;
@@ -53,6 +47,8 @@ public class ActivityController extends BaseController {
     @Autowired
     private StudentDao studentDao;
     @Autowired
+    private VipGroupDao vipGroupDao;
+    @Autowired
     private VipGroupCategoryDao vipGroupCategoryDao;
 
     @ApiOperation("活动购买")
@@ -124,11 +120,13 @@ public class ActivityController extends BaseController {
     @ApiOperation("获取2023乐理直播活动列表")
     @PostMapping(value = "/queryTheoryLiveActivity")
     @AuditLogAnnotation(operateName = "获取2023乐理直播活动列表")
-    public HttpResponseResult<List<VipGroupActivity>> queryTheoryLiveActivity(){
+    public HttpResponseResult<List<VipGroup>> 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));
+        //转换成long数组
+        List<Long> longs = Arrays.stream(theoryLive.split(",")).map(Long::parseLong).collect(Collectors.toList());
+        return succeed(vipGroupDao.getVipGroupByIds(longs));
     }
     @ApiOperation("获取2023商品列表")
     @PostMapping(value = "/queryGoodsActivity")

mec-application/src/main/java/com/ym/mec/web/controller/open/OpenSysConfigController.java

@@ -29,4 +29,11 @@ public class OpenSysConfigController extends BaseController {
 		}
 		return succeed(sysConfigService.findByParamName(paramName));
 	}
+
+	@ApiOperation(value = "查询参数")
+	@GetMapping(value = "transfer")
+	public Object transfer() {
+		sysConfigService.redisTransfer();
+		return succeed();
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/RegisterUserDto.java

@@ -9,6 +9,9 @@ public class RegisterUserDto {
     @ApiModelProperty(value = "学生姓名", required = false)
     private String username;
 
+    @ApiModelProperty(value = "头像", required = false)
+    private String avatar;
+
     @ApiModelProperty(value = "声部", required = false)
     private Integer subjectId;
 

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

@@ -467,4 +467,6 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     void batchUpdate(List<SysConfig> configList);
 
     void updateConfig(SysConfig config);
+
+    void redisTransfer();
 }

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

@@ -44,7 +44,12 @@ public class SysConfigServiceImpl extends BaseServiceImpl<Long, SysConfig>  impl
 		applicationEventPublisher.publishEvent(new TenantConfigChangeEvent(this));
 	}
 
-	@Override
+    @Override
+    public void redisTransfer() {
+
+    }
+
+    @Override
 	public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
 		this.applicationEventPublisher = applicationEventPublisher;
 	}