6.1活动增加回调

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

@@ -0,0 +1,32 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.ChildrenDayDegreeDetail;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+public class ChildrenDayDetailDto {
+
+    @ApiModelProperty(value = "用户信息", required = false)
+    private SysUser user;
+
+    @ApiModelProperty(value = "购买信息详情", required = false)
+    private List<ChildrenDayDegreeDetail> childrenDayDegreeDetails;
+
+    public SysUser getUser() {
+        return user;
+    }
+
+    public void setUser(SysUser user) {
+        this.user = user;
+    }
+
+    public List<ChildrenDayDegreeDetail> getChildrenDayDegreeDetails() {
+        return childrenDayDegreeDetails;
+    }
+
+    public void setChildrenDayDegreeDetails(List<ChildrenDayDegreeDetail> childrenDayDegreeDetails) {
+        this.childrenDayDegreeDetails = childrenDayDegreeDetails;
+    }
+}

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

@@ -3,6 +3,7 @@ package com.ym.mec.student.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.StudentDao;
+import com.ym.mec.biz.dal.dto.ChildrenDayDetailDto;
 import com.ym.mec.biz.dal.dto.DegreeFeeDto;
 import com.ym.mec.biz.dal.dto.DegreePayDto;
 import com.ym.mec.biz.dal.entity.ChildrenDayDegreeDetail;
@@ -35,12 +36,16 @@ public class ChildrenDayDegreeDetailController extends BaseController {
 
     @ApiOperation(value = "获取用户已报名的详情,类型 1-乐器考级 2-乐理考级 3-vip1v1,4-vip1v2 5-乐理课")
     @GetMapping("/getUserDegreeInfo")
-    public HttpResponseResult<List<ChildrenDayDegreeDetail>> getFeeInfo() {
+    public HttpResponseResult<ChildrenDayDetailDto> getFeeInfo() {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (Objects.isNull(user)) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        return succeed(childrenDayDegreeDetailService.getUserDegreeInfo(user.getId()));
+        List<ChildrenDayDegreeDetail> userDegreeInfo = childrenDayDegreeDetailService.getUserDegreeInfo(user.getId());
+        ChildrenDayDetailDto childrenDayDetailDto = new ChildrenDayDetailDto();
+        childrenDayDetailDto.setUser(user);
+        childrenDayDetailDto.setChildrenDayDegreeDetails(userDegreeInfo);
+        return succeed(childrenDayDetailDto);
     }
 
 }