Merge branch 'children_day'

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

@@ -11,6 +11,9 @@ public class ChildrenDayDetailDto {
     @ApiModelProperty(value = "用户信息", required = false)
     private SysUser user;
 
+    @ApiModelProperty(value = "声部id", required = false)
+    private Integer subjectId;
+
     @ApiModelProperty(value = "购买信息详情", required = false)
     private List<ChildrenDayDegreeDetail> childrenDayDegreeDetails;
 
@@ -22,6 +25,14 @@ public class ChildrenDayDetailDto {
         this.user = user;
     }
 
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
     public List<ChildrenDayDegreeDetail> getChildrenDayDegreeDetails() {
         return childrenDayDegreeDetails;
     }

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

@@ -4,24 +4,20 @@ 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;
-import com.ym.mec.biz.dal.entity.ChildrenDayReserve;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.biz.dal.entity.Student;
 import com.ym.mec.biz.service.ChildrenDayDegreeDetailService;
-import com.ym.mec.biz.service.ChildrenDayReserveService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
 @RequestMapping("childrenDayDegreeDetail")
@@ -32,7 +28,8 @@ public class ChildrenDayDegreeDetailController extends BaseController {
     private SysUserFeignService sysUserFeignService;
     @Autowired
     private ChildrenDayDegreeDetailService childrenDayDegreeDetailService;
-
+    @Autowired
+    private StudentDao studentDao;
 
     @ApiOperation(value = "获取用户已报名的详情,类型 1-乐器考级 2-乐理考级 3-vip1v1,4-vip1v2 5-乐理课")
     @GetMapping("/getUserDegreeInfo")
@@ -45,6 +42,10 @@ public class ChildrenDayDegreeDetailController extends BaseController {
         ChildrenDayDetailDto childrenDayDetailDto = new ChildrenDayDetailDto();
         childrenDayDetailDto.setUser(user);
         childrenDayDetailDto.setChildrenDayDegreeDetails(userDegreeInfo);
+        Student student = studentDao.get(user.getId());
+        if (student != null) {
+            childrenDayDetailDto.setSubjectId(Integer.parseInt(student.getSubjectIdList()));
+        }
         return succeed(childrenDayDetailDto);
     }
 

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

@@ -89,6 +89,8 @@ public class StudentOrderController extends BaseController {
     private MusicGroupPaymentCalenderCourseSettingsDao musicGroupPaymentCalenderCourseSettingsDao;
     @Autowired
     private ReplacementInstrumentActivityDao replacementInstrumentActivityDao;
+    @Autowired
+    private ChildrenDayDegreeDetailDao childrenDayDegreeDetailDao;
 
 
     @Value("${spring.profiles.active:dev}")
@@ -182,6 +184,8 @@ public class StudentOrderController extends BaseController {
             orderDetail.put("detail", studentGoodsSellDao.getStudentGoodsSellDto(orderNo));
         } else if (orderByOrderNo.getGroupType().equals(GroupType.REPLACEMENT)) {
             orderDetail.put("detail", replacementInstrumentActivityDao.getInfo(Integer.parseInt(orderByOrderNo.getMusicGroupId())));
+        } else if (orderByOrderNo.getGroupType().equals(GroupType.DEGREE)) {
+            orderDetail.put("detail", childrenDayDegreeDetailDao.getByOrderId(orderByOrderNo.getId()));
         }
         return succeed(orderDetail);
     }